From cb3e42e483b6553913ccc1a76d66b245a5e061ea Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Fri, 15 Mar 2013 14:12:40 -0400
Subject: [PATCH 1/3] BUG 11017 El usuario admin desaparese en la tabla
 USER_ROLES SOLVED

- El usuario admin pierde su rol al realizar una sismple asignacion de usuarios al rol Operador y desmarcar a admin.
- Filtering admin user.
---
 gulliver/system/class.rbac.php               | 14 ++++++++++++--
 workflow/engine/methods/roles/roles_Ajax.php |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php
index 4691b0c35..750ba420a 100755
--- a/gulliver/system/class.rbac.php
+++ b/gulliver/system/class.rbac.php
@@ -558,10 +558,20 @@ class RBAC
      */
     public function createPermision ($sCode)
     {
-        return $this->permissionsObj->create( array ('PER_CODE' => $sCode
-        ) );
+        return $this->permissionsObj->create( array ('PER_CODE' => $sCode) );
     }
 
+    /**
+     * Return Permision System PROCESSMAKER_ADMIN
+     *
+     * @access public
+     *
+     * @return type
+     */
+    public function getPermisionSystem()
+    {
+        return $this->permissionsObj->getPerSystem();
+    }
     /**
      * loading role by code
      *
diff --git a/workflow/engine/methods/roles/roles_Ajax.php b/workflow/engine/methods/roles/roles_Ajax.php
index 17ff7084f..9391eb1c8 100755
--- a/workflow/engine/methods/roles/roles_Ajax.php
+++ b/workflow/engine/methods/roles/roles_Ajax.php
@@ -223,6 +223,11 @@ switch ($REQUEST) {
         $arrUsers = explode( ',', $USR_UID );
         foreach ($arrUsers as $aUID) {
             $RBAC->deleteUserRole( $ROL_UID, $aUID );
+            if ($aUID == '00000000000000000000000000000001') {
+                $sData['USR_UID'] = $aUID;
+                $sData['ROL_UID'] = $RBAC->getPermisionSystem();
+                $RBAC->assignUserToRole( $sData );
+            }
         }
         break;
     case 'rolesList':

From cfb5b434a6158a3107d0553b9fd4fda69970350f Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Fri, 15 Mar 2013 16:00:00 -0400
Subject: [PATCH 2/3] BUG 11017 El usuario admin desaparese en la tabla
 USER_ROLES SOLVED

- El usuario admin pierde su rol al realizar una sismple asignacion de usuarios al rol Operador y desmarcar a admin.
- Ajustment default admin role.
---
 workflow/engine/methods/roles/roles_Ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/methods/roles/roles_Ajax.php b/workflow/engine/methods/roles/roles_Ajax.php
index 9391eb1c8..c095c76bc 100755
--- a/workflow/engine/methods/roles/roles_Ajax.php
+++ b/workflow/engine/methods/roles/roles_Ajax.php
@@ -225,7 +225,7 @@ switch ($REQUEST) {
             $RBAC->deleteUserRole( $ROL_UID, $aUID );
             if ($aUID == '00000000000000000000000000000001') {
                 $sData['USR_UID'] = $aUID;
-                $sData['ROL_UID'] = $RBAC->getPermisionSystem();
+                $sData['ROL_UID'] = '00000000000000000000000000000002';
                 $RBAC->assignUserToRole( $sData );
             }
         }

From d4819556f353bf84ca91ef22e14b6ab8092981d8 Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Fri, 15 Mar 2013 16:20:31 -0400
Subject: [PATCH 3/3] BUG 11017 El usuario admin desaparese en la tabla
 USER_ROLES SOLVED

- El usuario admin pierde su rol al realizar una sismple asignacion de usuarios al rol Operador y desmarcar a admin.
- Revert changes in rbac class.
---
 gulliver/system/class.rbac.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php
index 750ba420a..b2a0ce068 100755
--- a/gulliver/system/class.rbac.php
+++ b/gulliver/system/class.rbac.php
@@ -561,17 +561,6 @@ class RBAC
         return $this->permissionsObj->create( array ('PER_CODE' => $sCode) );
     }
 
-    /**
-     * Return Permision System PROCESSMAKER_ADMIN
-     *
-     * @access public
-     *
-     * @return type
-     */
-    public function getPermisionSystem()
-    {
-        return $this->permissionsObj->getPerSystem();
-    }
     /**
      * loading role by code
      *