From 7dad6b0d133f67219cfa64f04e47a6673105fdd0 Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Thu, 25 Jul 2013 14:55:11 -0400
Subject: [PATCH] BUG 12374 Un usuario NO Administrador pero con permisos de
 PM_USERS ... SOLVED

- Un usuario NO Administrador pero con permisos de PM_USERS puede auto-configurarse como Administrador.
- Adjustment in validation of the user logged.
---
 workflow/engine/methods/users/usersAjax.php |  8 +++++++-
 workflow/engine/templates/users/users.js    | 10 ++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index 840616ea0..0df2a23bb 100755
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -105,7 +105,7 @@ switch ($_POST['action']) {
         require_once 'classes/model/Users.php';
         $oUser = new Users();
         $aUserLog = $oUser->loadDetailed($_SESSION['USER_LOGGED']);
-		print (G::json_encode(array(
+        print (G::json_encode(array(
             'USR_UID' => $aUserLog['USR_UID'],
             'USR_USERNAME' => $aUserLog['USR_USERNAME'],
             'USR_ROLE' => $aUserLog['USR_ROLE']
@@ -488,6 +488,12 @@ switch ($_POST['action']) {
             }
         }
 
+        require_once 'classes/model/Users.php';
+        $oUser = new Users();
+        $aUserLog = $oUser->loadDetailed($_SESSION['USER_LOGGED']);
+        $aFields['USER_LOGGED_NAME'] = $aUserLog['USR_USERNAME'];
+        $aFields['USER_LOGGED_ROLE'] = $aUserLog['USR_ROLE'];
+
         $aFields['CASES_MENUSELECTED_NAME'] = $casesMenuSelected;
 
         $result->success = true;
diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js
index 8cce30fb2..5bdcbd5fe 100755
--- a/workflow/engine/templates/users/users.js
+++ b/workflow/engine/templates/users/users.js
@@ -37,7 +37,7 @@ var userLogedName = '';
 var userLogedRole = '';
 var userRoleLoad = '';
 
-const PROCESSMAKER_ADMIN = 'PROCESSMAKER_ADMIN';
+var PROCESSMAKER_ADMIN = 'PROCESSMAKER_ADMIN';
 
 global.IC_UID        = '';
 global.IS_UID        = '';
@@ -48,8 +48,6 @@ Ext.onReady(function () {
   Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
   Ext.QuickTips.init();
 
-  getUserLogedRoleRequest();
-
   box = new Ext.BoxComponent({
     width          : 100,
     height         : 80,
@@ -1199,6 +1197,8 @@ function saveUser()
 //Load data
 function loadData()
 {
+    getUserLogedRoleRequest();
+
     comboCountry.store.load();
 
 
@@ -1287,7 +1287,9 @@ function loadUserData()
                 //
             }
 
-            userRoleLoad = data.user.USR_ROLE;
+            userRoleLoad  = data.user.USR_ROLE;
+            userLogedName = data.user.USER_LOGGED_NAME;
+            userLogedRole = data.user.USER_LOGGED_ROLE;
 
             comboCountry.store.on("load", function(store) {
                 comboCountry.setValue(data.user.USR_COUNTRY);