Updated roles

Author: lucas.reynolds

app/Config/Schema/arcs.sql

@@ -149,7 +149,7 @@ CREATE TABLE IF NOT EXISTS users (
     name VARCHAR(100),
     username VARCHAR(100),
     password VARCHAR(100),
-    role INT(1),
+    role VARCHAR(100),
     activation CHAR(36),
     reset CHAR(36),
     last_login DATETIME,

app/Controller/AppController.php

@@ -33,7 +33,7 @@ public function beforeFilter() {
                 'name' => $this->Auth->user('name'),
                 'email' => $this->Auth->user('email'),
                 'role' => $this->Auth->loggedIn() ? 
-                    intVal($this->Auth->user('role')) : 3,
+                    $this->Auth->user('role') : "Researcher",
                 'username' => $this->Auth->user('username'),
                 'gravatar' => md5(strtolower($this->Auth->user('email')))
             ),

app/Controller/Component/AccessComponent.php

@@ -13,9 +13,8 @@ class AccessComponent extends Component {
 
     public $roles = array(
         'Admin' => 0,
-        'SrResearcher' => 1,
-        'Researcher' => 2,
-        'Unknown' => 3
+        'Moderator' => 1,
+        'Researcher' => 2
     );
 
     public function __call($name, $arguments) {

app/View/Collections/viewer.tpl

@@ -44,7 +44,7 @@
       <ul class="dropdown-menu">
         <li><a id="rethumb-btn">Re-thumbnail</a></li>
         <li><a id="split-btn">Split PDF</a></li>
-        {% if user.role == 0 %}
+        {% if user.role == "Admin" %}
         <li class="divider"></li>
         <li><a id="delete-btn">Delete this resource...</a></li>
         <li><a id="delete-col-btn">Delete collection...</a></li>

app/View/Elements/toolbar.ctp

@@ -15,7 +15,7 @@
         <div id="droppedMenu" class="dropped-menu">
             <?php echo $this->Html->link('Profile', 
                 '/user/' . $user['username'] . '/') ?>
-            <?php if ($user['role'] === 0): ?>
+            <?php if ($user['role'] == "Admin"): ?>
             <?php echo $this->Html->link('Admin', 
                 '/admin') ?>
             <?php endif ?>

app/View/JST/admin/users.jst

@@ -11,11 +11,7 @@
     <td><%= u.name %></td>
     <td><%= u.username %></td>
     <td><%= u.email %></td>
-    <td>
-      <% if (u.role == 0) print('Admin') %>
-      <% if (u.role == 1) print('Sr. Researcher') %>
-      <% if (u.role == 2) print('Researcher') %>
-    <td>
+    <td><%= u.role %></td>
       <button id="delete-btn" class="btn btn-danger btn-mini "
         data-id="<%= u.id %>">Delete</button>
       <button id="edit-btn" class="btn btn-info btn-mini"

app/View/Layouts/default.ctp

@@ -41,7 +41,7 @@
             <?php endif ?>
         </div>
         <?php echo $this->element('footer') ?>
-        <?php if ($user['role'] == 0 && Configure::read('debug') == 2) echo $this->element('sql') ?> 
+        <?php if ($user['role'] == "Admin" && Configure::read('debug') == 2) echo $this->element('sql') ?> 
         <!-- user voice -->
         <script type="text/javascript">
             var uvOptions = {};

app/View/Resources/viewer.tpl

@@ -36,7 +36,7 @@
       <ul class="dropdown-menu">
         <li><a id="rethumb-btn">Re-thumbnail</a></li>
         <li><a id="split-btn">Split PDF</a></li>
-        {% if user.role == 0 %}
+        {% if user.role == "Admin" %}
         <li><a id="delete-btn">Delete</a></li>
         {% endif %}
       </ul>

app/View/Search/search.tpl

@@ -111,14 +111,14 @@
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
-          {% if user.role < 2 %}
+          {% if user.role == "Admin" || user.role == "Moderator" %}
           <li><a id="access-btn">Set Access...</a></li>
           <li class="divider"></li>
           {% endif %}
           <li><a id="rethumb-btn">Redo thumbnail</a></li>
           <li><a id="repreview-btn">Redo preview</a></li>
           <li><a id="split-btn">Split PDF</a></li>
-          {% if user.role == 0 %}
+          {% if user.role == "Admin" %}
           <li class="divider"></li>
           <li><a id="delete-btn">Delete...</a></li>
           <li class="divider"></li>

app/View/Users/profile.ctp

@@ -10,14 +10,7 @@
                         <?php echo $user_info['User']['email']; ?></a>
                 </dd>
                 <dd><?php echo $user_info['User']['username']?></dd>
-                <dd>Role: 
-                <?php 
-                    $role = $user_info['User']['role'];
-                    if ($role == 0) echo "Admin";
-                    if ($role == 1) echo "Moderator";
-                    if ($role == 2) echo "Researcher";
-                ?>
-                </dd>
+                <dd>Role: <?php echo $user_info['User']['role']; ?></dd>
                 <dd>Projects: Polis, Isthmia, Chersonesos, Nemea</dd>
                 <dd>Active Since: <?php echo $user_info['User']['activeSince']; ?></dd>
                 <?php if ($user['id'] == $user_info['User']['id']): ?>

app/tmp/cache/models/arcs_cake_model_default_annotations

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 N;

app/tmp/cache/models/arcs_cake_model_default_arcs_dev_annotations

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 a:16:{s:2:"id";a:7:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:36;s:3:"key";s:7:"primary";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:11:"resource_id";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:13:"resource_name";a:6:{s:4:"type";s:4:"text";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:7:"user_id";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:9:"user_name";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:10:"user_email";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:13:"user_username";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:8:"relation";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:10:"transcript";a:7:{s:4:"type";s:4:"text";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;s:3:"key";s:5:"index";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:3:"url";a:6:{s:4:"type";s:4:"text";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:2:"x1";a:4:{s:4:"type";s:5:"float";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:2:"y1";a:4:{s:4:"type";s:5:"float";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:2:"x2";a:4:{s:4:"type";s:5:"float";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:2:"y2";a:4:{s:4:"type";s:5:"float";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:7:"created";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:8:"modified";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}}

app/tmp/cache/models/arcs_cake_model_default_arcs_dev_collections

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 a:9:{s:2:"id";a:7:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:36;s:3:"key";s:7:"primary";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:5:"title";a:7:{s:4:"type";s:4:"text";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;s:3:"key";s:5:"index";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:11:"description";a:6:{s:4:"type";s:4:"text";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:6:"public";a:4:{s:4:"type";s:7:"boolean";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:1;}s:7:"user_id";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:3:"pdf";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:9:"temporary";a:4:{s:4:"type";s:7:"boolean";s:4:"null";b:1;s:7:"default";s:1:"0";s:6:"length";i:1;}s:7:"created";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:8:"modified";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}}

app/tmp/cache/models/arcs_cake_model_default_arcs_dev_comments

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 a:6:{s:2:"id";a:7:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:36;s:3:"key";s:7:"primary";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:11:"resource_id";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:7:"user_id";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:7:"content";a:7:{s:4:"type";s:4:"text";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;s:3:"key";s:5:"index";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:7:"created";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:8:"modified";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}}

app/tmp/cache/models/arcs_cake_model_default_arcs_dev_list

@@ -1,2 +1,2 @@
-1442341669
+1442585540
 a:11:{i:0;s:11:"annotations";i:1;s:9:"bookmarks";i:2;s:11:"collections";i:3;s:8:"comments";i:4;s:5:"flags";i:5;s:4:"jobs";i:6;s:8:"keywords";i:7;s:11:"memberships";i:8;s:8:"metadata";i:9;s:9:"resources";i:10;s:5:"users";}

app/tmp/cache/models/arcs_cake_model_default_arcs_dev_metadata

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 a:11:{s:2:"id";a:7:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:36;s:3:"key";s:7:"primary";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:11:"resource_id";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:13:"resource_name";a:6:{s:4:"type";s:4:"text";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:7:"user_id";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:9:"user_name";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:10:"user_email";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:13:"user_username";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:9:"attribute";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:50;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:5:"value";a:7:{s:4:"type";s:4:"text";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;s:3:"key";s:5:"index";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:7:"created";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:8:"modified";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}}

app/tmp/cache/models/arcs_cake_model_default_arcs_dev_resources

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 a:14:{s:2:"id";a:7:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:36;s:3:"key";s:7:"primary";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:7:"user_id";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:3:"sha";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:40;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:6:"public";a:4:{s:4:"type";s:7:"boolean";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:1;}s:9:"exclusive";a:4:{s:4:"type";s:7:"boolean";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:1;}s:9:"file_name";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:200;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:9:"file_size";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:11;}s:9:"mime_type";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:5:"title";a:6:{s:4:"type";s:4:"text";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:7:"context";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:9:"first_req";a:4:{s:4:"type";s:7:"boolean";s:4:"null";b:1;s:7:"default";s:1:"1";s:6:"length";i:1;}s:7:"created";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:8:"modified";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:4:"type";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:200;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}}

app/tmp/cache/models/arcs_cake_model_default_arcs_dev_users

@@ -1,2 +1,2 @@
-1442341669
+1442585540
 a:11:{s:2:"id";a:7:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:36;s:3:"key";s:7:"primary";s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:5:"email";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:4:"name";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:8:"username";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:8:"password";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:4:"role";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:100;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:7:"created";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:8:"modified";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}s:10:"activation";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:5:"reset";a:6:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:36;s:7:"collate";s:17:"latin1_swedish_ci";s:7:"charset";s:6:"latin1";}s:10:"last_login";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:1;s:7:"default";N;s:6:"length";N;}}

app/tmp/cache/models/arcs_cake_model_default_collections

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 N;

app/tmp/cache/models/arcs_cake_model_default_comments

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 N;

app/tmp/cache/models/arcs_cake_model_default_metadata

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 N;

app/tmp/cache/models/arcs_cake_model_default_resources

@@ -1,2 +1,2 @@
-1442341669
+1442584448
 N;

app/tmp/cache/models/arcs_cake_model_default_users

@@ -1,2 +1,2 @@
-1442341673
+1442585540
 N;

app/tmp/cache/persistent/arcs_cake_core_cake_dev_en-us

@@ -1,2 +1,2 @@
-1442341669
+1442585540
 a:1:{s:11:"LC_MESSAGES";a:0:{}}

app/tmp/cache/persistent/arcs_cake_core_cake_en-us

@@ -1,2 +1,2 @@
-1442341669
+1442585540
 a:1:{s:11:"LC_MESSAGES";a:0:{}}

app/tmp/cache/persistent/arcs_cake_core_default_en-us

@@ -1,2 +1,2 @@
-1442341669
+1442585540
 a:1:{s:11:"LC_MESSAGES";a:0:{}}