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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	workflow/engine/classes/class.processMap.php
	workflow/engine/classes/model/AdditionalTables.php
This commit is contained in:
Erik Amaru Ortiz
2014-04-02 09:34:54 -04:00
parent e5e62da380 92947e646a
commit 7a47472ea1
60 changed files with 597 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,7 @@ Ext.onReady(function(){
{name : 'USR_LASTNAME'},
{name : 'USR_EMAIL'},
{name : 'USR_ROLE'},
{name : 'USR_ROLE_ID'},
{name : 'USR_DUE_DATE'},
{name : 'DEP_TITLE'},
{name : 'LAST_LOGIN'},
@@ -150,9 +151,9 @@ Ext.onReady(function(){
cmodel = new Ext.grid.ColumnModel({
columns: [
{id:'USR_UID', dataIndex: 'USR_UID', hidden:true, hideable:false},
//{header: '', dataIndex: 'USR_UID', width: 30, align:'center', sortable: false, renderer: photo_user},
{header: _('ID_USER_NAME'), dataIndex: 'USR_USERNAME', width: 90, hidden:false, align:'left'},
{header: _('ID_FULL_NAME'), dataIndex: 'USR_USERNAME', width: 50, align:'left', renderer: full_name},
{dataIndex: 'USR_ROLE_ID', hidden:true, hideable:false},
{header: _('ID_ROLE'), dataIndex: 'USR_ROLE', width: 50, hidden:false, align:'left'},
{header: _('ID_STATUS'), dataIndex: 'USR_STATUS', width: 50, hidden: true, align: 'center', renderer: render_status},
{
@@ -171,12 +172,12 @@ Ext.onReady(function(){
fields: ['id', 'name'],
data : uxTypes
}),
listeners: {
select: function(a, b) {
listeners: {
select: function(combo, newValue) {
var row = usersGrid.getSelectionModel().getSelected();
role = row.get('USR_ROLE');
role = row.get('USR_ROLE_ID');
if (role == 'PROCESSMAKER_ADMIN' && (this.value == 'SIMPLIFIED' || this.value == 'SINGLE')) {
if (role == 'PROCESSMAKER_ADMIN' && (combo.getValue() == 'SIMPLIFIED' || combo.getValue() == 'SINGLE')) {
PMExt.warning(_('ID_WARNING'), _('ID_ADMINS_CANT_USE_UXS'));
this.setValue('NORMAL');
}