From 8cd9ccdf569327de006a211c709f5e521ac13aa1 Mon Sep 17 00:00:00 2001
From: Carlos Pacha <carlos@colosa.com>
Date: Thu, 13 Jan 2011 20:20:49 +0000
Subject: [PATCH] this bug 5867 was solved, you can change the status in a role
 and if this role is inactive it doesnt appear in user edit

---
 workflow/engine/methods/roles/roles_Ajax.php  | 33 +++++++++++++++++--
 workflow/engine/xmlform/roles/roles_Edit.xml  |  4 +--
 .../engine/xmlform/roles/roles_Options.xml    |  4 +--
 .../engine/xmlform/users/users_EditRT.xml     |  4 +--
 workflow/engine/xmlform/users/users_New.xml   |  2 +-
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/workflow/engine/methods/roles/roles_Ajax.php b/workflow/engine/methods/roles/roles_Ajax.php
index 883e86e32..4d8f07f56 100644
--- a/workflow/engine/methods/roles/roles_Ajax.php
+++ b/workflow/engine/methods/roles/roles_Ajax.php
@@ -114,8 +114,37 @@ switch ($REQUEST) {
         break;
     
     case 'updateDataRole':
-		$response = ($RBAC->verifyNewRole($_GET['code']))?'true':'false';
-		print($response);
+		  require_once 'classes/model/om/BaseRoles.php';
+      require_once 'classes/model/Content.php';
+      $oCriteria = new Criteria('rbac');
+      $oCriteria->addSelectColumn(RolesPeer::ROL_UID);
+      $oCriteria->addSelectColumn(RolesPeer::ROL_PARENT);
+      $oCriteria->addSelectColumn(RolesPeer::ROL_SYSTEM);
+      $oCriteria->addSelectColumn(RolesPeer::ROL_CODE);
+      $oCriteria->addSelectColumn(RolesPeer::ROL_CREATE_DATE);
+      $oCriteria->addSelectColumn(RolesPeer::ROL_UPDATE_DATE);
+      $oCriteria->addSelectColumn(RolesPeer::ROL_STATUS);
+      $oCriteria->add(RolesPeer::ROL_CODE, $_GET['code']);
+        
+      $result = RolesPeer::doSelectRS($oCriteria);
+      $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+      $result->next();
+      $row = $result->getRow();
+      
+      $oCriteria1 = new Criteria('workflow');
+      $oCriteria1->add(ContentPeer::CON_CATEGORY, 'ROL_NAME');
+      $oCriteria1->add(ContentPeer::CON_ID,    $row['ROL_UID']);
+      $oCriteria1->add(ContentPeer::CON_LANG,     SYS_LANG);
+      $oDataset1 = ContentPeer::doSelectRS($oCriteria1);
+      $oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+      $oDataset1->next();
+      $aRow1 = $oDataset1->getRow();
+      $row['ROL_NAME'] = $aRow1['CON_VALUE'];
+     	$row['ROL_UPDATE_DATE'] = date("Y-M-d H:i:s");
+
+      $RBAC->updateRole($row);          
+		//$response = ($RBAC->verifyNewRole($_GET['code']))?'true':'false';
+		
         break;
         
     case 'usersIntoRole':
diff --git a/workflow/engine/xmlform/roles/roles_Edit.xml b/workflow/engine/xmlform/roles/roles_Edit.xml
index 0db95b3e6..60a090708 100644
--- a/workflow/engine/xmlform/roles/roles_Edit.xml
+++ b/workflow/engine/xmlform/roles/roles_Edit.xml
@@ -17,7 +17,7 @@
 </ROL_NAME>
 
 <ROL_STATUS type="dropdown" size="25" maxlength="32" defaultvalue="Active">
-  <en>Status<option name="1">Active</option><option name="">Inactive</option></en>
+  <en>Status<option name="1">Active</option><option name="0">Inactive</option></en>
 </ROL_STATUS>
 
 <BTN_CANCEL type="button" onclick="cancel()">
@@ -35,4 +35,4 @@ function cancel(){
 
 ]]></JS>
 
-</dynaForm> 
\ No newline at end of file
+</dynaForm> 
diff --git a/workflow/engine/xmlform/roles/roles_Options.xml b/workflow/engine/xmlform/roles/roles_Options.xml
index 208b579b7..db69828c2 100644
--- a/workflow/engine/xmlform/roles/roles_Options.xml
+++ b/workflow/engine/xmlform/roles/roles_Options.xml
@@ -20,7 +20,7 @@ PROCESS_REQUEST_FILE = '../roles/roles_Ajax';
 PROCESS_REQUEST_FILE_USER = '../roles/roles_AddUser';
 
 function newRol() {
-	popupWindow('', '../roles/roles_Ajax?request=newRole', 350, 225);
+	popupWindow('', '../roles/roles_Ajax?request=newRole', 350, 265);
 }
 
 
@@ -86,7 +86,7 @@ function editRole(ROL_UID)
 	if(ROL_UID!='00000000000000000000000000000002')
 	 {	 
     	var uri = 'request=editRole&ROL_UID='+ROL_UID;	
-    	popupWindow('', '../roles/roles_Ajax?'+uri, 350, 225);
+    	popupWindow('', '../roles/roles_Ajax?'+uri, 350, 265);
    }
    else
    {  
diff --git a/workflow/engine/xmlform/users/users_EditRT.xml b/workflow/engine/xmlform/users/users_EditRT.xml
index b8adc1ebb..b8aee65b0 100755
--- a/workflow/engine/xmlform/users/users_EditRT.xml
+++ b/workflow/engine/xmlform/users/users_EditRT.xml
@@ -112,7 +112,7 @@
   </USR_STATUS>
 
   <USR_ROLE type="dropdown" defaultvalue="" required="0" group="1" dependentfields="" readonly="0" sqlconnection="rbac" noshowingrid="0" readonlyingrid="0"><![CDATA[
-  SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' ORDER BY ROL_CODE
+  SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' AND ROL_STATUS = 1 ORDER BY ROL_CODE
     ]]><en>Role</en>
   </USR_ROLE>
 
@@ -279,4 +279,4 @@
 
   ]]></JS>
 
-</dynaForm>
\ No newline at end of file
+</dynaForm>
diff --git a/workflow/engine/xmlform/users/users_New.xml b/workflow/engine/xmlform/users/users_New.xml
index cb32867d5..d9375fd6f 100644
--- a/workflow/engine/xmlform/users/users_New.xml
+++ b/workflow/engine/xmlform/users/users_New.xml
@@ -105,7 +105,7 @@ SELECT CALENDAR_UID, CALENDAR_NAME FROM availableCalendars
 </USR_STATUS>
 
 <USR_ROLE type="dropdown" defaultvalue=""  required="0" group="1" dependentfields="" readonly="0" sqlconnection="rbac" noshowingrid="0" readonlyingrid="0">
-SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' ORDER BY FIELD(ROL_CODE,'@#DEFAULT_ROLE') DESC
+SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' AND ROL_STATUS = 1 ORDER BY FIELD(ROL_CODE,'@#DEFAULT_ROLE') DESC
   <en>Role</en>
 </USR_ROLE>