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

Merged in dheeyi/processmaker/PM-1730 (pull request #1631)

Browse Source 
PM-1730 0016850: Change "Supervisor" to "Manager" in departments
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-10 17:35:28 -04:00
parent 2615af7403 982d19d95a
commit 7016a8afa9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/templates/departments/departmentUsers.js
View File

@@ -65,7 +65,7 @@ Ext.onReady(function(){
}); });
supervisorButton = new Ext.Action({ supervisorButton = new Ext.Action({
text: _('ID_SET_SUPERVISOR'), text: _('ID_SET_MANAGER'),
iconCls: 'button_menu_ext ss_sprite ss_user_edit', iconCls: 'button_menu_ext ss_sprite ss_user_edit',
handler: UpdateSupervisor, handler: UpdateSupervisor,
disabled: true disabled: true
@@ -344,7 +344,7 @@ DDLoadUsers = function(){
if (records[r].data['USR_SUPERVISOR']==false) { if (records[r].data['USR_SUPERVISOR']==false) {
arrAux[r] = records[r].data['USR_UID']; arrAux[r] = records[r].data['USR_UID'];
}else{ }else{
PMExt.notify(_('ID_DEPARTMENTS'),_('ID_DELETE_SUPERVISOR')); PMExt.notify(_('ID_DEPARTMENTS'),_('ID_DELETE_MANAGER'));
}; };
} }
DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess); DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess);
@@ -433,7 +433,7 @@ RemoveGroupsAction = function(){
if (rowsSelected[a].get('USR_SUPERVISOR')==false) { if (rowsSelected[a].get('USR_SUPERVISOR')==false) {
arrAux[a] = rowsSelected[a].get('USR_UID'); arrAux[a] = rowsSelected[a].get('USR_UID');
}else{ }else{
PMExt.notify(_('ID_DEPARTMENTS'),_('ID_DELETE_SUPERVISOR')); PMExt.notify(_('ID_DEPARTMENTS'),_('ID_DELETE_MANAGER'));
}; };
} }
DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess); DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess);
@@ -512,7 +512,7 @@ CancelEditMembersAction = function(){
//Render Full User Name //Render Full User Name
show_user = function(v,i,s){ show_user = function(v,i,s){
var sName = _FNF(v,s.data.USR_FIRSTNAME, s.data.USR_LASTNAME); var sName = _FNF(v,s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
if (s.data.USR_SUPERVISOR) sName = sName + '&nbsp;<font color="green">[' + _('ID_SUPERVISOR') + ']</font>'; if (s.data.USR_SUPERVISOR) sName = sName + '&nbsp;<font color="green">[' + _('ID_MANAGER') + ']</font>';
return sName; return sName;
}; };
@@ -527,7 +527,7 @@ UpdateSupervisor = function(){
viewport.getEl().unmask(); viewport.getEl().unmask();
supervisorButton.disable(); supervisorButton.disable();
DoSearchP(); DoSearchP();
PMExt.notify(_('ID_DEPARTMENTS'),_('ID_SET_SUPERVISOR_SUCCESS')); PMExt.notify(_('ID_DEPARTMENTS'),_('ID_SET_MANAGER_SUCCESS'));
}, },
failure: function (r,o){ failure: function (r,o){
viewport.getEl().unmask(); viewport.getEl().unmask();