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

fix merge conflicts

Browse Source
This commit is contained in:
Rodrigo Quelca
2020-12-18 19:28:38 +00:00
parent e40be8189c fd17dd2c24
commit 5011ba6b76
83 changed files with 59072 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/templates/authSources/authSourcesSynchronize.js
View File

@@ -38,7 +38,7 @@ Ext.onReady(function() {
text : _('ID_BACK'),
iconCls: "button_menu_ext ss_sprite ss_arrow_left",
handler: function() {
location.href = '../authSources/authSources_List';
location.href = "../authenticationSources/index";
}
});

2
workflow/engine/templates/ldapAdvanced/ldapAdvancedSearch.js
View File

@@ -71,7 +71,7 @@ Ext.onReady(function() {
handler: function ()
{
redirectPage("authSources_List");
location.href = "../authenticationSources/index";
}
});
}

3
workflow/engine/templates/mails/emailList.js
View File

@@ -54,6 +54,9 @@ Ext.onReady(function(){
data = PMExt.emailConst.numberColumn.defaultValue;
}
}
if (metadata.id === 'APP_MSG_TO' || metadata.id === 'APP_MSG_ERROR') {
return Ext.util.Format.htmlEncode(data);
}
var new_text = metadata.style.split(';');
var style = '';
for (var i = 0; i < new_text.length -1 ; i++) {

2
workflow/engine/templates/users/usersGroups.js
View File

@@ -413,7 +413,7 @@ Ext.onReady(function(){
{
text: _("ID_EDIT"),
handler: function () {
location.href = "usersEdit?USR_UID=" + USERS.USR_UID + "&USR_AUTH_SOURCE=" + USERS.USR_AUTH_SOURCE + "&MODE=edit";
location.href = "usersEdit?USR_UID=" + USERS.USR_UID + "&USR_AUTH_SOURCE=" + USERS.USR_AUTH_SOURCE + "&MODE=edit&userInterface=v2";
}
}
]

4
workflow/engine/templates/users/usersList.js
View File

@@ -427,7 +427,7 @@ DoNothing = function(){};
//Open New User Form
NewUserAction = function(){
location.href = 'usersNew?MODE=new';
location.href = 'usersNew?MODE=new&userInterface=v2';
};
//Change user status
@@ -572,7 +572,7 @@ SummaryTabOpen = function(){
EditUserAction = function(){
var uid = infoGrid.getSelectionModel().getSelected();
if (uid) {
location.href = 'usersEdit?USR_UID=' + uid.data.USR_UID+'&USR_AUTH_SOURCE=' + uid.data.USR_AUTH_SOURCE+'&MODE=edit';
location.href = 'usersEdit?USR_UID=' + uid.data.USR_UID+'&USR_AUTH_SOURCE=' + uid.data.USR_AUTH_SOURCE+'&MODE=edit&userInterface=v2';
}
};