A few fixes to export-import.

[timetracker.git] / role_edit.php

diff --git a/role_edit.php b/role_edit.php
index 21ed258..946f834 100644 (file)
--- a/role_edit.php
+++ b/role_edit.php
@@ -33,7 +33,7 @@ import('ttTaskHelper'); // TODO: remove this?
 import('ttRoleHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -44,15 +44,17 @@ if (!$role) {
   exit();
 }
 $assigned_rights = explode(',', $role['rights']);
-$available_rights = array_diff($user->rights_array, $assigned_rights);
+$available_rights = array_diff($user->rights, $assigned_rights);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
+  $cl_rank = $request->getParameter('rank');
   $cl_status = $request->getParameter('status');
 } else {
   $cl_name = $role['name'];
   $cl_description = $role['description'];
+  $cl_rank = $role['rank'];
   $cl_status = $role['status'];
 }
 
@@ -60,6 +62,13 @@ $form = new Form('roleForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_role_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+for ($i = 0; $i < $user->rank; $i++) {
+  $rank_data[] = $i;
+}
+$form->addInput(array('type'=>'combobox','name'=>'rank','data'=>$rank_data,'value'=>$cl_rank));
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
+  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
 
 // Multiple select controls for assigned and available rights.
 $form->addInput(array('type'=>'combobox','name'=>'assigned_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$assigned_rights));
@@ -67,11 +76,6 @@ $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getK
 $form->addInput(array('type'=>'combobox','name'=>'available_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$available_rights));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
 
-
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-
 if ($request->isPost()) {
     if ($request->getParameter('btn_save')) {
     // Validate user input.
@@ -85,6 +89,7 @@ if ($request->isPost()) {
         if (ttRoleHelper::update(array(
           'id' => $cl_role_id,
           'name' => $cl_name,
+          'rank' => $cl_rank,
           'description' => $cl_description,
           'status' => $cl_status))) {
           header('Location: roles.php');
@@ -119,7 +124,7 @@ if ($request->isPost()) {
        $rights = str_replace($right_to_add, '', $rights);
        $rights = str_replace(',,',',', $rights);
        // Add the right only if we have it ourselves.
-       if (in_array($right_to_add, $user->rights_array))
+       if (in_array($right_to_add, $user->rights))
          $rights .= ','.$right_to_add;
      }
      $rights = trim($rights, ',');