From 6ae68823c6d313fd93cbcdbc722499b19a0325a0 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Thu, 21 Mar 2013 13:06:02 -0400
Subject: [PATCH 1/2] BUG 11052 Notice en Report Table al hacer correr un caso
 con old version IMPROVEMENT

---
 workflow/engine/classes/class.reportTables.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.reportTables.php b/workflow/engine/classes/class.reportTables.php
index 7e0eb8a1a..398c35ad5 100755
--- a/workflow/engine/classes/class.reportTables.php
+++ b/workflow/engine/classes/class.reportTables.php
@@ -591,7 +591,7 @@ class ReportTables
                                             if (! isset( $aFields[$aField['sFieldName']] )) {
                                                 $aFields[$aField['sFieldName']] = '';
                                             }
-                                            $sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? mysql_real_escape_string( $aFields[$aField['sFieldName']] ) : '') . "',";
+                                            $sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName']] ) : '') . "',";
                                             break;
                                         case 'date':
                                             $mysqlDate = (isset( $aFields[$aField['sFieldName']] ) ? $aFields[$aField['sFieldName']] : '');

From 981434725872cff2a4cc54a34a1fec4f14ba6460 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Thu, 21 Mar 2013 13:38:31 -0400
Subject: [PATCH 2/2] BUG 11021: Change the role names from PROCESSMAKER_XXXX
 to only "XXXX" IMPROVEMENT

---
 rbac/engine/classes/model/Roles.php      | 5 +++++
 workflow/engine/classes/model/Users.php  | 5 +++++
 workflow/engine/templates/users/users.js | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/rbac/engine/classes/model/Roles.php b/rbac/engine/classes/model/Roles.php
index ffa8f5007..cbd429460 100755
--- a/rbac/engine/classes/model/Roles.php
+++ b/rbac/engine/classes/model/Roles.php
@@ -84,6 +84,11 @@ class Roles extends BaseRoles {
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             $aRow = $oDataset->getRow();
+            
+            $roles = new Roles();
+        	$roles->load($aRow['ROL_UID']);
+        	$aRow['ROL_NAME'] = $roles->getRolName();
+            
             if (is_array($aRow)) {
                 return $aRow;
             } else {
diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index 745cde70b..9ef2ab0ec 100755
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -141,6 +141,11 @@ class Users extends BaseUsers
                 $aFields["USR_COUNTRY_NAME"]  = (!empty($aIsoCountry["IC_NAME"]))? $aIsoCountry["IC_NAME"] : "";
                 $aFields["USR_CITY_NAME"]     = (!empty($aIsoSubdivision["IS_NAME"]))? $aIsoSubdivision["IS_NAME"] : "";
                 $aFields["USR_LOCATION_NAME"] = (!empty($aIsoLocation["IL_NAME"]))? $aIsoLocation["IL_NAME"] : "";
+                
+                require_once PATH_RBAC . "model/Roles.php";
+                $roles = new Roles();
+                $role = $roles->loadByCode($aFields['USR_ROLE']);
+                $aFields['USR_ROLE_NAME'] = $role['ROL_NAME'];
 
                 $result = $aFields;
 
diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js
index 900a617fa..35ae5c294 100644
--- a/workflow/engine/templates/users/users.js
+++ b/workflow/engine/templates/users/users.js
@@ -1196,7 +1196,7 @@ function loadUserData()
                 Ext.getCmp("USR_REPLACED_BY2").setText(data.user.REPLACED_NAME);
                 Ext.getCmp("USR_DUE_DATE2").setText(data.user.USR_DUE_DATE);
                 Ext.getCmp("USR_STATUS2").setText(_('ID_' + data.user.USR_STATUS));
-                Ext.getCmp("USR_ROLE2").setText(data.user.USR_ROLE);
+                Ext.getCmp("USR_ROLE2").setText(data.user.USR_ROLE_NAME);
 
                 Ext.getCmp("PREF_DEFAULT_MAIN_MENU_OPTION2").setText(data.user.MENUSELECTED_NAME);
                 Ext.getCmp("PREF_DEFAULT_CASES_MENUSELECTED2").setText(data.user.CASES_MENUSELECTED_NAME);