fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 8919 La opción "user experience" se puede aplicar al usuario Admin SOLVED

Browse Source 
- en la pestaña de grupos, si admitia asignar "Simplified" en "User Experience" a grupos que tienen algun usuario administrador
- se añadio un case que filtre esos usuarios.
This commit is contained in:
Alvaro Campos
2012-04-16 10:20:20 -04:00
parent 9297940b8b
commit d12c29d277
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
workflow/engine/methods/users/users_Ajax.php
View File

@@ -150,6 +150,28 @@ try {
echo $aValues['USR_FIRSTNAME'] . ' ' . $aValues['USR_LASTNAME'] . '<br>';
}
break;
//This case is used to check if any of the user group has as role 'PROCESSMAKER_ADMIN',
case 'usersAdminGroupExtJS':
G::LoadClass('groups');
$oGroup = new Groups();
$aGroup = $oGroup->getUsersOfGroup($_POST['GRP_UID']);
$responseUser = 'false';
$usersAdmin = '';
foreach ($aGroup as $iIndex => $aValues) {
if ($aValues['USR_ROLE'] == 'PROCESSMAKER_ADMIN') {
$responseUser = 'true';
$usersAdmin .= $aValues['USR_FIRSTNAME'] . ' ' . $aValues['USR_LASTNAME'].', ';
}
}
$usersAdmin = substr($usersAdmin, 0, -2);
$result = new stdClass();
$result->reponse = $responseUser;
$result->users = $usersAdmin;
echo G::json_encode($result);
break;
case 'canDeleteUser':
G::LoadClass('case');
$oProcessMap = new Cases();

28
workflow/engine/templates/admin/uxUsersList.js
View File

@@ -277,6 +277,7 @@ Ext.onReady(function(){
editor: new Ext.form.ComboBox({
listClass: 'x-combo-list-small',
mode: 'local',
id:'GRP_UXCombo',
displayField:'name',
lazyRender: true,
triggerAction: 'all',
@@ -287,30 +288,21 @@ Ext.onReady(function(){
data : uxTypes
}),
listeners: {
select: function(a, b) {
var nameGroup = groupsGrid.getSelectionModel().selection['record'].data['CON_VALUE'];
var uidGroup = groupsGrid.getSelectionModel().selection['record'].data['GRP_UID'];
select: function(a, b) {
var uidGroup = groupsGrid.getSelectionModel().selection['record'].data['GRP_UID'];
Ext.Ajax.request({
url: '../users/users_Ajax?function=usersGroupAllFieldsExtJS',
url: '../users/users_Ajax?function=usersAdminGroupExtJS',
params: { GRP_UID: uidGroup },
success: function(result, request) {
var res = Ext.decode(result.responseText);
console.log(res.data);
var res = Ext.decode(result.responseText);
if ((res.reponse == 'true') && (Ext.getCmp('GRP_UXCombo').getValue()!='SWITCHABLE') && (Ext.getCmp('GRP_UXCombo').getValue()!='NORMAL')) {
PMExt.warning(_('ID_WARNING'), _('ID_ADMINS_CANT_USE_UXS')+'<br/> <b>'+_('ID_USERS_LIST')+':</b> '+res.users);
Ext.getCmp('GRP_UXCombo').setValue('NORMAL');
}
}
});
/*var row = usersGrid.getSelectionModel().getSelected();
role = row.get('USR_ROLE');
if (role == 'PROCESSMAKER_ADMIN' && (this.value == 'SIMPLIFIED' || this.value == 'SINGLE')) {
PMExt.warning(_('ID_WARNING'), _('ID_ADMINS_CANT_USE_UXS'));
this.setValue('NORMAL');
}*/
});
}
}
})
}
]