Upgrade JS files

This commit is contained in:
Fernando Ontiveros
2025-04-04 00:21:28 +00:00
parent f9cd9a035b
commit 884e67f883
11 changed files with 16 additions and 122 deletions

View File

@@ -854,13 +854,12 @@ Ext.onReady ( function() {
}); });
//Layout Resizing //Layout Resizing
/*----------------------------------********---------------------------------*/
if (typeof valueFilterStatus != 'undefined') { if (typeof valueFilterStatus != 'undefined') {
if (valueFilterStatus != '') { if (valueFilterStatus != '') {
storeCases.setBaseParam('filterStatus', valueFilterStatus); storeCases.setBaseParam('filterStatus', valueFilterStatus);
} }
} }
/*----------------------------------********---------------------------------*/
storeCases.on('load',function(){var viewport = Ext.getCmp("viewportcases");viewport.doLayout();}) storeCases.on('load',function(){var viewport = Ext.getCmp("viewportcases");viewport.doLayout();})
// creating the button for filters // creating the button for filters
@@ -1069,7 +1068,6 @@ Ext.onReady ( function() {
filterStatus = []; filterStatus = [];
} }
/*----------------------------------********---------------------------------*/
var comboFilterStatus = new Ext.form.ComboBox({ var comboFilterStatus = new Ext.form.ComboBox({
width : 180, width : 180,
boxMaxWidth : 200, boxMaxWidth : 200,
@@ -1102,7 +1100,6 @@ Ext.onReady ( function() {
}, },
iconCls: 'no-icon' iconCls: 'no-icon'
}); });
/*----------------------------------********---------------------------------*/
var btnSelectAll = new Ext.Button ({ var btnSelectAll = new Ext.Button ({
text: _('CHECK_ALL'), text: _('CHECK_ALL'),
@@ -2667,11 +2664,9 @@ Ext.onReady ( function() {
suggestProcess.setValue(""); suggestProcess.setValue("");
comboStatus.setValue(""); comboStatus.setValue("");
comboColumnSearch.setValue("APP_TITLE"); comboColumnSearch.setValue("APP_TITLE");
/*----------------------------------********---------------------------------*/
if (typeof valueFilterStatus !== 'undefined') { if (typeof valueFilterStatus !== 'undefined') {
comboFilterStatus.setValue(valueFilterStatus); comboFilterStatus.setValue(valueFilterStatus);
} }
/*----------------------------------********---------------------------------*/
} }
function reassign(){ function reassign(){
storeReassignCases.removeAll(); storeReassignCases.removeAll();

View File

@@ -36,15 +36,11 @@ emailServer.application = {
//Data //Data
var p; var p;
/*----------------------------------********---------------------------------*/
if (Ext.getCmp("chkEmailServerDefault").checked) { if (Ext.getCmp("chkEmailServerDefault").checked) {
/*----------------------------------********---------------------------------*/
var emailDefault = 1; var emailDefault = 1;
/*----------------------------------********---------------------------------*/
} else { } else {
var emailDefault = 0; var emailDefault = 0;
} }
/*----------------------------------********---------------------------------*/
var typeEmailEngine = Ext.getCmp("cboEmailEngine").getValue(); var typeEmailEngine = Ext.getCmp("cboEmailEngine").getValue();
@@ -69,7 +65,6 @@ emailServer.application = {
emailServerDefault: emailDefault emailServerDefault: emailDefault
}; };
} else if (typeEmailEngine === "IMAP") { } else if (typeEmailEngine === "IMAP") {
/*----------------------------------********---------------------------------*/
var rdoGrpOption = Ext.getCmp("rdoGrpSmtpSecure").getValue(); var rdoGrpOption = Ext.getCmp("rdoGrpSmtpSecure").getValue();
var smtpSecure = rdoGrpOption.getGroupValue(); var smtpSecure = rdoGrpOption.getGroupValue();
@@ -91,7 +86,6 @@ emailServer.application = {
mailTo: Ext.getCmp("txtMailTo").getValue(), mailTo: Ext.getCmp("txtMailTo").getValue(),
emailServerDefault: emailDefault emailServerDefault: emailDefault
}; };
/*----------------------------------********---------------------------------*/
} else { } else {
//MAIL //MAIL
p = { p = {
@@ -211,9 +205,7 @@ emailServer.application = {
Ext.getCmp("textClientId").setValue(""); Ext.getCmp("textClientId").setValue("");
Ext.getCmp("textClientSecret").setValue(""); Ext.getCmp("textClientSecret").setValue("");
/*----------------------------------********---------------------------------*/
Ext.getCmp("chkEmailServerDefault").setValue(false); Ext.getCmp("chkEmailServerDefault").setValue(false);
/*----------------------------------********---------------------------------*/
winData.setTitle(_("ID_EMAIL_SERVER_NEW")); winData.setTitle(_("ID_EMAIL_SERVER_NEW"));
winData.setDisabled(false); winData.setDisabled(false);
@@ -255,15 +247,11 @@ emailServer.application = {
Ext.getCmp("textClientId").setValue(record.get("OAUTH_CLIENT_ID")); Ext.getCmp("textClientId").setValue(record.get("OAUTH_CLIENT_ID"));
Ext.getCmp("textClientSecret").setValue(record.get("OAUTH_CLIENT_SECRET")); Ext.getCmp("textClientSecret").setValue(record.get("OAUTH_CLIENT_SECRET"));
/*----------------------------------********---------------------------------*/
if (parseInt(record.get("MESS_DEFAULT")) == 1) { if (parseInt(record.get("MESS_DEFAULT")) == 1) {
/*----------------------------------********---------------------------------*/
Ext.getCmp("chkEmailServerDefault").setValue(true); Ext.getCmp("chkEmailServerDefault").setValue(true);
/*----------------------------------********---------------------------------*/
} else { } else {
Ext.getCmp("chkEmailServerDefault").setValue(false); Ext.getCmp("chkEmailServerDefault").setValue(false);
} }
/*----------------------------------********---------------------------------*/
winData.setTitle(_("ID_EMAIL_SERVER_EDIT")); winData.setTitle(_("ID_EMAIL_SERVER_EDIT"));
winData.setDisabled(false); winData.setDisabled(false);
@@ -286,9 +274,8 @@ emailServer.application = {
Ext.getCmp("button2Continue").setVisible(false); Ext.getCmp("button2Continue").setVisible(false);
Ext.getCmp("btnTest").setVisible(true); Ext.getCmp("btnTest").setVisible(true);
Ext.getCmp("btnSave").setVisible(true); Ext.getCmp("btnSave").setVisible(true);
/*----------------------------------********---------------------------------*/
Ext.getCmp("chkEmailServerDefault").setVisible(true); Ext.getCmp("chkEmailServerDefault").setVisible(true);
/*----------------------------------********---------------------------------*/
if (cboEmailEngine === "PHPMAILER") { if (cboEmailEngine === "PHPMAILER") {
Ext.getCmp("txtServer").setVisible(true); Ext.getCmp("txtServer").setVisible(true);
Ext.getCmp("txtPort").setVisible(true); Ext.getCmp("txtPort").setVisible(true);
@@ -319,7 +306,6 @@ emailServer.application = {
Ext.getCmp("textClientId").allowBlank = true; Ext.getCmp("textClientId").allowBlank = true;
Ext.getCmp("textClientSecret").allowBlank = true; Ext.getCmp("textClientSecret").allowBlank = true;
} else if (cboEmailEngine === "IMAP") { } else if (cboEmailEngine === "IMAP") {
/*----------------------------------********---------------------------------*/
Ext.getCmp("txtServer").setVisible(true); Ext.getCmp("txtServer").setVisible(true);
Ext.getCmp("txtPort").setVisible(true); Ext.getCmp("txtPort").setVisible(true);
try { try {
@@ -348,7 +334,6 @@ emailServer.application = {
Ext.getCmp("txtAccountFrom").allowBlank = false; Ext.getCmp("txtAccountFrom").allowBlank = false;
Ext.getCmp("textClientId").allowBlank = true; Ext.getCmp("textClientId").allowBlank = true;
Ext.getCmp("textClientSecret").allowBlank = true; Ext.getCmp("textClientSecret").allowBlank = true;
/*----------------------------------********---------------------------------*/
} else if (cboEmailEngine === "GMAILAPI") { } else if (cboEmailEngine === "GMAILAPI") {
Ext.getCmp("txtServer").setVisible(true); Ext.getCmp("txtServer").setVisible(true);
Ext.getCmp("txtServer").setValue("smtp.gmail.com"); Ext.getCmp("txtServer").setValue("smtp.gmail.com");
@@ -631,9 +616,7 @@ emailServer.application = {
data: [ data: [
["PHPMAILER", "SMTP (PHPMailer)"], ["PHPMAILER", "SMTP (PHPMailer)"],
/*----------------------------------********---------------------------------*/
["IMAP", "SMTP - IMAP (PHPMailer)"], ["IMAP", "SMTP - IMAP (PHPMailer)"],
/*----------------------------------********---------------------------------*/
["MAIL", "Mail (PHP)"], ["MAIL", "Mail (PHP)"],
["GMAILAPI", "GMAIL API SMTP-IMAP"], ["GMAILAPI", "GMAIL API SMTP-IMAP"],
["OFFICE365API", "OFFICE 365 API SMTP-IMAP"] ["OFFICE365API", "OFFICE 365 API SMTP-IMAP"]
@@ -1020,9 +1003,7 @@ emailServer.application = {
rdoGrpSmtpSecure, rdoGrpSmtpSecure,
chkSendTestMail, chkSendTestMail,
txtMailTo txtMailTo
/*----------------------------------********---------------------------------*/
, chkEmailServerDefault , chkEmailServerDefault
/*----------------------------------********---------------------------------*/
] ]
}); });
@@ -1303,22 +1284,14 @@ emailServer.application = {
var arrayAux1 = []; var arrayAux1 = [];
/*----------------------------------********---------------------------------*/
if (EMAILSERVER_LICENSED) {
arrayAux1.push(btnNew); arrayAux1.push(btnNew);
arrayAux1.push("-"); arrayAux1.push("-");
}
/*----------------------------------********---------------------------------*/
arrayAux1.push(btnEdit); arrayAux1.push(btnEdit);
/*----------------------------------********---------------------------------*/
arrayAux1.push(btnDelete); arrayAux1.push(btnDelete);
arrayAux1.push("->"); arrayAux1.push("->");
arrayAux1.push(txtSearch); arrayAux1.push(txtSearch);
arrayAux1.push(btnTextClear); arrayAux1.push(btnTextClear);
arrayAux1.push(btnSearch); arrayAux1.push(btnSearch);
/*----------------------------------********---------------------------------*/
var grdpnlMain = new Ext.grid.GridPanel({ var grdpnlMain = new Ext.grid.GridPanel({
id: "grdpnlMain", id: "grdpnlMain",
@@ -1334,9 +1307,7 @@ emailServer.application = {
tbar: arrayAux1, tbar: arrayAux1,
/*----------------------------------********---------------------------------*/
bbar: pagingData, bbar: pagingData,
/*----------------------------------********---------------------------------*/
title: _("ID_EMAIL_SERVER_TITLE"), title: _("ID_EMAIL_SERVER_TITLE"),
border: false, border: false,
@@ -1362,9 +1333,7 @@ emailServer.application = {
arrayAux2.push(btnEdit); arrayAux2.push(btnEdit);
/*----------------------------------********---------------------------------*/
arrayAux2.push(btnDelete); arrayAux2.push(btnDelete);
/*----------------------------------********---------------------------------*/
var mnuContext = new Ext.menu.Menu({ var mnuContext = new Ext.menu.Menu({
id: "mnuContext", id: "mnuContext",

View File

@@ -334,9 +334,7 @@ Ext.onReady(function () {
disabled: true, disabled: true,
inputValue: 'always' inputValue: 'always'
} }
} }, {
/*----------------------------------********---------------------------------*/
, {
xtype: 'booleancolumn', xtype: 'booleancolumn',
header: _('ID_INDEX'), header: _('ID_INDEX'),
dataIndex: 'field_index', dataIndex: 'field_index',
@@ -351,7 +349,6 @@ Ext.onReady(function () {
inputValue: 'always' inputValue: 'always'
} }
} }
/*----------------------------------********---------------------------------*/
]; ];
//if permissions plugin is enabled //if permissions plugin is enabled
@@ -1100,14 +1097,12 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldNull, fieldPrimaryKey, f
fieldPrimaryKey.setValue(false); fieldPrimaryKey.setValue(false);
} }
/*----------------------------------********---------------------------------*/
if (swI == 1) { if (swI == 1) {
fieldIndex.enable(); fieldIndex.enable();
} else { } else {
fieldIndex.disable(); fieldIndex.disable();
fieldIndex.setValue(false); fieldIndex.setValue(false);
} }
/*----------------------------------********---------------------------------*/
if (swAI == 1) { if (swAI == 1) {
fieldInc.enable(); fieldInc.enable();

View File

@@ -401,9 +401,7 @@ Ext.onReady(function () {
width: 50, width: 50,
align: 'right', align: 'right',
editor: sizeField editor: sizeField
} }, {
/*----------------------------------********---------------------------------*/
, {
xtype: 'booleancolumn', xtype: 'booleancolumn',
header: _('ID_INDEX'), header: _('ID_INDEX'),
dataIndex: 'field_index', dataIndex: 'field_index',
@@ -418,7 +416,6 @@ Ext.onReady(function () {
inputValue: 'always' inputValue: 'always'
} }
} }
/*----------------------------------********---------------------------------*/
]; ];
function validateFieldSizeAutoincrement(valueType, defaultValue) { function validateFieldSizeAutoincrement(valueType, defaultValue) {
@@ -1340,14 +1337,14 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldIndex, fieldInc, sizeEdi
swAI = 0; swAI = 0;
swI = 0; swI = 0;
} }
/*----------------------------------********---------------------------------*/
if (swI == 1) { if (swI == 1) {
fieldIndex.enable(); fieldIndex.enable();
} else { } else {
fieldIndex.disable(); fieldIndex.disable();
fieldIndex.setValue(false); fieldIndex.setValue(false);
} }
/*----------------------------------********---------------------------------*/
if (typeof fieldInc !== 'undefined') { if (typeof fieldInc !== 'undefined') {
if (swAI == 1) { if (swAI == 1) {
fieldInc.enable(); fieldInc.enable();

View File

@@ -160,9 +160,7 @@ Ext.onReady(function(){
{name : 'CASES_COUNT_COMPLETED', type:'float'}, {name : 'CASES_COUNT_COMPLETED', type:'float'},
{name : 'CASES_COUNT_CANCELLED', type:'float'}, {name : 'CASES_COUNT_CANCELLED', type:'float'},
{name : 'PROJECT_TYPE', type:'string'} {name : 'PROJECT_TYPE', type:'string'}
/*----------------------------------********---------------------------------*/
,{name : "PRO_TYPE_PROCESS", type: "string"} ,{name : "PRO_TYPE_PROCESS", type: "string"}
/*----------------------------------********---------------------------------*/
,{name : "PRO_UPDATE_DATE_LABEL"} ,{name : "PRO_UPDATE_DATE_LABEL"}
] ]
}), }),
@@ -318,7 +316,7 @@ Ext.onReady(function(){
exportProcess(); exportProcess();
} }
}; };
/*----------------------------------********---------------------------------*/
if (isGranularFeature) { if (isGranularFeature) {
granularExportProcessOption = { granularExportProcessOption = {
xtype: "tbsplit", xtype: "tbsplit",
@@ -353,11 +351,9 @@ Ext.onReady(function(){
}; };
exportProcessOption = granularExportProcessOption; exportProcessOption = granularExportProcessOption;
} else { } else {
/*----------------------------------********---------------------------------*/
exportProcessOption = normalExportProcessOption; exportProcessOption = normalExportProcessOption;
/*----------------------------------********---------------------------------*/
} }
/*----------------------------------********---------------------------------*/
//End code export - exportGranular (handle) //End code export - exportGranular (handle)
var proSelModel = new Ext.grid.CheckboxSelectionModel({ var proSelModel = new Ext.grid.CheckboxSelectionModel({
listeners: { listeners: {
@@ -417,9 +413,7 @@ Ext.onReady(function(){
,{header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 50, align:'right', sortable: false} ,{header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 50, align:'right', sortable: false}
,{header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 70, renderer:function(v){return "<b>"+v+"</b>";}, align:'right', sortable: false} ,{header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 70, renderer:function(v){return "<b>"+v+"</b>";}, align:'right', sortable: false}
,{header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 30} ,{header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 30}
/*----------------------------------********---------------------------------*/
,{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 70} ,{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 70}
/*----------------------------------********---------------------------------*/
,{header: _("ID_LAN_UPDATE_DATE"), dataIndex: "PRO_UPDATE_DATE_LABEL", width: 90} ,{header: _("ID_LAN_UPDATE_DATE"), dataIndex: "PRO_UPDATE_DATE_LABEL", width: 90}
] ]
}), }),
@@ -515,7 +509,7 @@ Ext.onReady(function(){
var activator = Ext.getCmp('activator'); var activator = Ext.getCmp('activator');
activator.setDisabled(false); activator.setDisabled(false);
/*----------------------------------********---------------------------------*/
if(rowSelected.data.PROJECT_TYPE === 'bpmn' && isGranularFeature){ if(rowSelected.data.PROJECT_TYPE === 'bpmn' && isGranularFeature){
processesGrid.getTopToolbar().remove('export'); processesGrid.getTopToolbar().remove('export');
processesGrid.getTopToolbar().insert(6, granularExportProcessOption); processesGrid.getTopToolbar().insert(6, granularExportProcessOption);
@@ -525,7 +519,7 @@ Ext.onReady(function(){
processesGrid.getTopToolbar().insert(6, normalExportProcessOption); processesGrid.getTopToolbar().insert(6, normalExportProcessOption);
processesGrid.getTopToolbar().doLayout(); processesGrid.getTopToolbar().doLayout();
} }
/*----------------------------------********---------------------------------*/
Ext.ComponentMgr.get("export").setDisabled(false); Ext.ComponentMgr.get("export").setDisabled(false);
if( rowSelected.data.PRO_STATUS == 'ACTIVE' ){ if( rowSelected.data.PRO_STATUS == 'ACTIVE' ){
@@ -583,7 +577,6 @@ Ext.onReady(function(){
function onMessageContextMenu(grid, rowIndex, e) { function onMessageContextMenu(grid, rowIndex, e) {
e.stopEvent(); e.stopEvent();
var coords = e.getXY(); var coords = e.getXY();
/*----------------------------------********---------------------------------*/
var rowSelected = grid.getStore().getAt(rowIndex); var rowSelected = grid.getStore().getAt(rowIndex);
if(rowSelected.data.PROJECT_TYPE === 'bpmn' && isGranularFeature) { if(rowSelected.data.PROJECT_TYPE === 'bpmn' && isGranularFeature) {
messageContextMenu.remove('export-menu'); messageContextMenu.remove('export-menu');
@@ -592,7 +585,6 @@ Ext.onReady(function(){
messageContextMenu.remove('export-menu'); messageContextMenu.remove('export-menu');
messageContextMenu.addItem(normalMenuExportOption); messageContextMenu.addItem(normalMenuExportOption);
} }
/*----------------------------------********---------------------------------*/
messageContextMenu.showAt([coords[0], coords[1]]); messageContextMenu.showAt([coords[0], coords[1]]);
} }
//code export - exportGranular (handler) //code export - exportGranular (handler)
@@ -607,7 +599,6 @@ Ext.onReady(function(){
} }
}; };
/*----------------------------------********---------------------------------*/
if (isGranularFeature) { if (isGranularFeature) {
granularMenuExportOption = { granularMenuExportOption = {
id: 'export-menu', id: 'export-menu',
@@ -636,11 +627,8 @@ Ext.onReady(function(){
}; };
menuExportOption = granularMenuExportOption; menuExportOption = granularMenuExportOption;
} else { } else {
/*----------------------------------********---------------------------------*/
menuExportOption = normalMenuExportOption; menuExportOption = normalMenuExportOption;
/*----------------------------------********---------------------------------*/
} }
/*----------------------------------********---------------------------------*/
//End code export - exportGranular (handler) //End code export - exportGranular (handler)
var arrayContextMenuOption = [ var arrayContextMenuOption = [
@@ -2096,9 +2084,7 @@ importProcess = function()
switch (fileExtension) { switch (fileExtension) {
case "pm": case "pm":
case "pmx": case "pmx":
/*----------------------------------********---------------------------------*/
case "pmx2": case "pmx2":
/*----------------------------------********---------------------------------*/
var uploader = Ext.getCmp("uploader"); var uploader = Ext.getCmp("uploader");
if (uploader.getForm().isValid()) { if (uploader.getForm().isValid()) {

View File

@@ -173,7 +173,6 @@ try {
* you can change it or redirect to another page * you can change it or redirect to another page
* i.e. G::header("Location: http://www.processmaker.com"); * i.e. G::header("Location: http://www.processmaker.com");
*/ */
/*----------------------------------********---------------------------------*/
$_POST['__notValidateThisFields__'] = (isset( $_POST['__notValidateThisFields__'] ) && $_POST['__notValidateThisFields__'] != '') ? $_POST['__notValidateThisFields__'] : $_POST['DynaformRequiredFields']; $_POST['__notValidateThisFields__'] = (isset( $_POST['__notValidateThisFields__'] ) && $_POST['__notValidateThisFields__'] != '') ? $_POST['__notValidateThisFields__'] : $_POST['DynaformRequiredFields'];
if ($missing_req_values = $oForm->validateRequiredFields( $_POST['form'], Bootstrap::json_decode( stripslashes( $_POST['__notValidateThisFields__'] ) ) )) { if ($missing_req_values = $oForm->validateRequiredFields( $_POST['form'], Bootstrap::json_decode( stripslashes( $_POST['__notValidateThisFields__'] ) ) )) {
$fieldsRequired = Bootstrap::json_decode(str_replace(array("%27", "%39"), array("\"", "'"), $_POST["DynaformRequiredFields"])); $fieldsRequired = Bootstrap::json_decode(str_replace(array("%27", "%39"), array("\"", "'"), $_POST["DynaformRequiredFields"]));
@@ -196,7 +195,7 @@ try {
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
exit( 0 ); exit( 0 );
} }
/*----------------------------------********---------------------------------*/
$_SESSION["__webEntrySuccess__"] = $aMessage; $_SESSION["__webEntrySuccess__"] = $aMessage;
G::header("location:{weTitle}Info.php"); G::header("location:{weTitle}Info.php");
} catch (Exception $e) { } catch (Exception $e) {

View File

@@ -412,7 +412,6 @@ Ext.onReady(function () {
hidden: !(__SYSTEM_UTC_TIME_ZONE__ == 1) hidden: !(__SYSTEM_UTC_TIME_ZONE__ == 1)
}); });
/*----------------------------------********---------------------------------*/
storeLanguage = new Ext.data.Store({ storeLanguage = new Ext.data.Store({
proxy: new Ext.data.HttpProxy({ proxy: new Ext.data.HttpProxy({
url: "usersAjax", url: "usersAjax",
@@ -446,7 +445,6 @@ Ext.onReady(function () {
mode : 'local', mode : 'local',
hidden : !(LANGUAGE_MANAGEMENT == 1) hidden : !(LANGUAGE_MANAGEMENT == 1)
}); });
/*----------------------------------********---------------------------------*/
var informationFields = new Ext.form.FieldSet({ var informationFields = new Ext.form.FieldSet({
title : _('ID_PERSONAL_INFORMATION'), title : _('ID_PERSONAL_INFORMATION'),
@@ -560,12 +558,9 @@ Ext.onReady(function () {
comboStatus, comboStatus,
comboRole, comboRole,
cboTimeZone cboTimeZone
/*----------------------------------********---------------------------------*/
,comboLanguage ,comboLanguage
/*----------------------------------********---------------------------------*/
] ]
}); });
/*----------------------------------********---------------------------------*/
var costByHour = new Ext.form.FieldSet({ var costByHour = new Ext.form.FieldSet({
title : _('ID_COSTS'), title : _('ID_COSTS'),
items : [ items : [
@@ -591,7 +586,6 @@ Ext.onReady(function () {
} }
] ]
}); });
/*----------------------------------********---------------------------------*/
var passwordFields = new Ext.form.FieldSet({ var passwordFields = new Ext.form.FieldSet({
title : _('ID_CHANGE_PASSWORD'), title : _('ID_CHANGE_PASSWORD'),
items : [ items : [
@@ -836,9 +830,7 @@ Ext.onReady(function () {
items : [ items : [
csrfToken, csrfToken,
informationFields, informationFields,
/*----------------------------------********---------------------------------*/
costByHour, costByHour,
/*----------------------------------********---------------------------------*/
passwordFields, passwordFields,
accountOptions, accountOptions,
profileFields, profileFields,
@@ -1002,7 +994,6 @@ Ext.onReady(function () {
} }
] ]
}); });
/*----------------------------------********---------------------------------*/
costByHour2 = new Ext.form.FieldSet({ costByHour2 = new Ext.form.FieldSet({
title : _('ID_COSTS'), title : _('ID_COSTS'),
items : [ items : [
@@ -1021,7 +1012,6 @@ Ext.onReady(function () {
] ]
}); });
/*----------------------------------********---------------------------------*/
passwordFields2 = new Ext.form.FieldSet({ passwordFields2 = new Ext.form.FieldSet({
title : _('ID_PASSWORD'), title : _('ID_PASSWORD'),
items : [ items : [
@@ -1070,9 +1060,7 @@ Ext.onReady(function () {
box2, box2,
//profileFields2, //profileFields2,
informationFields2, informationFields2,
/*----------------------------------********---------------------------------*/
costByHour2, costByHour2,
/*----------------------------------********---------------------------------*/
//passwordFields2, //passwordFields2,
preferencesFields2 preferencesFields2
], ],
@@ -1264,13 +1252,11 @@ function saveUser()
return false; return false;
} }
} }
/*----------------------------------********---------------------------------*/
if (!Ext.getCmp('USR_COST_BY_HOUR').isValid()) { if (!Ext.getCmp('USR_COST_BY_HOUR').isValid()) {
PMExt.warning(_('ID_ERROR'), _('ID_INVALID_VALUE_EXPECTING_POSITIVE_DECIMAL', _('ID_COST_BY_HOUR'))); PMExt.warning(_('ID_ERROR'), _('ID_INVALID_VALUE_EXPECTING_POSITIVE_DECIMAL', _('ID_COST_BY_HOUR')));
Ext.getCmp('USR_COST_BY_HOUR').focus(true,10); Ext.getCmp('USR_COST_BY_HOUR').focus(true,10);
return false; return false;
} }
/*----------------------------------********---------------------------------*/
if (USR_UID == '00000000000000000000000000000001') { if (USR_UID == '00000000000000000000000000000001') {
if (Ext.getCmp('USR_ROLE').getValue() != PROCESSMAKER_ADMIN) { if (Ext.getCmp('USR_ROLE').getValue() != PROCESSMAKER_ADMIN) {
@@ -1400,12 +1386,10 @@ function loadData()
}); });
comboRole.store.load(); comboRole.store.load();
/*----------------------------------********---------------------------------*/
comboLanguage.store.on("load", function (store) { comboLanguage.store.on("load", function (store) {
comboLanguage.setValue(store.getAt(1).get("LAN_ID")); comboLanguage.setValue(store.getAt(1).get("LAN_ID"));
}); });
comboLanguage.store.load(); comboLanguage.store.load();
/*----------------------------------********---------------------------------*/
setPreferencesData(false, null); setPreferencesData(false, null);
} }
@@ -1436,10 +1420,8 @@ function loadUserData() {
USR_POSITION: data.user.USR_POSITION, USR_POSITION: data.user.USR_POSITION,
USR_DUE_DATE: data.user.USR_DUE_DATE, USR_DUE_DATE: data.user.USR_DUE_DATE,
USR_STATUS: data.user.USR_STATUS, USR_STATUS: data.user.USR_STATUS,
/*----------------------------------********---------------------------------*/
USR_COST_BY_HOUR: data.user.USR_COST_BY_HOUR, USR_COST_BY_HOUR: data.user.USR_COST_BY_HOUR,
USR_UNIT_COST: data.user.USR_UNIT_COST, USR_UNIT_COST: data.user.USR_UNIT_COST,
/*----------------------------------********---------------------------------*/
USR_LOGGED_NEXT_TIME: data.user.USR_LOGGED_NEXT_TIME USR_LOGGED_NEXT_TIME: data.user.USR_LOGGED_NEXT_TIME
}); });
@@ -1464,11 +1446,9 @@ function loadUserData() {
Ext.getCmp("USR_STATUS2").setText(_('ID_' + data.user.USR_STATUS)); Ext.getCmp("USR_STATUS2").setText(_('ID_' + data.user.USR_STATUS));
Ext.getCmp("USR_ROLE2").setText(data.user.USR_ROLE_NAME); Ext.getCmp("USR_ROLE2").setText(data.user.USR_ROLE_NAME);
Ext.getCmp("USR_TIME_ZONE2").setText((data.user.USR_TIME_ZONE != "") ? data.user.USR_TIME_ZONE : SYSTEM_TIME_ZONE); Ext.getCmp("USR_TIME_ZONE2").setText((data.user.USR_TIME_ZONE != "") ? data.user.USR_TIME_ZONE : SYSTEM_TIME_ZONE);
/*----------------------------------********---------------------------------*/
Ext.getCmp("USR_DEFAULT_LANG2").setText(data.user.USR_DEFAULT_LANG_NAME); Ext.getCmp("USR_DEFAULT_LANG2").setText(data.user.USR_DEFAULT_LANG_NAME);
Ext.getCmp("USR_COST_BY_HOUR2").setText(data.user.USR_COST_BY_HOUR); Ext.getCmp("USR_COST_BY_HOUR2").setText(data.user.USR_COST_BY_HOUR);
Ext.getCmp("USR_UNIT_COST2").setText(data.user.USR_UNIT_COST); Ext.getCmp("USR_UNIT_COST2").setText(data.user.USR_UNIT_COST);
/*----------------------------------********---------------------------------*/
Ext.getCmp("USR_CALENDAR2").setText(data.user.CALENDAR_NAME); Ext.getCmp("USR_CALENDAR2").setText(data.user.CALENDAR_NAME);
Ext.getCmp("PREF_DEFAULT_MAIN_MENU_OPTION2").setText(data.user.MENUSELECTED_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); Ext.getCmp("PREF_DEFAULT_CASES_MENUSELECTED2").setText(data.user.CASES_MENUSELECTED_NAME);
@@ -1509,11 +1489,10 @@ function loadUserData() {
cboTimeZone.setValue((data.user.USR_TIME_ZONE != "") ? data.user.USR_TIME_ZONE : SYSTEM_TIME_ZONE); cboTimeZone.setValue((data.user.USR_TIME_ZONE != "") ? data.user.USR_TIME_ZONE : SYSTEM_TIME_ZONE);
/*----------------------------------********---------------------------------*/
comboLanguage.store.on("load", function (store) { comboLanguage.store.on("load", function (store) {
comboLanguage.setValue(data.user.USR_DEFAULT_LANG); comboLanguage.setValue(data.user.USR_DEFAULT_LANG);
}); });
/*----------------------------------********---------------------------------*/
setPreferencesData(true, data); setPreferencesData(true, data);
previousUsername = Ext.getCmp("USR_USERNAME").getValue(); previousUsername = Ext.getCmp("USR_USERNAME").getValue();
@@ -1536,9 +1515,7 @@ function loadUserData() {
storeRole.load(); storeRole.load();
/*----------------------------------********---------------------------------*/
storeLanguage.load(); storeLanguage.load();
/*----------------------------------********---------------------------------*/
}, },
failure: function (r, o) { failure: function (r, o) {
//viewport.getEl().unmask(); //viewport.getEl().unmask();

View File

@@ -191,9 +191,7 @@ if (getField('OP_OBJ_TYPE').value=='OUTPUT') {
showRowById( 'OP_ACTION' ); showRowById( 'OP_ACTION' );
} }
if (getField('OP_OBJ_TYPE').value=='CASES_NOTES' if (getField('OP_OBJ_TYPE').value=='CASES_NOTES'
/*----------------------------------********---------------------------------*/
|| getField('OP_OBJ_TYPE').value=='SUMMARY_FORM') || getField('OP_OBJ_TYPE').value=='SUMMARY_FORM')
/*----------------------------------********---------------------------------*/
{ {
hideRowById( 'ALL' ); hideRowById( 'ALL' );
hideRowById( 'DYNAFORMS' ); hideRowById( 'DYNAFORMS' );
@@ -235,9 +233,7 @@ leimnud.event.add(document.getElementById('form[OP_OBJ_TYPE]'), 'change', functi
showRowById( 'OP_ACTION' ); showRowById( 'OP_ACTION' );
} }
if (getField('OP_OBJ_TYPE').value=='CASES_NOTES' if (getField('OP_OBJ_TYPE').value=='CASES_NOTES'
/*----------------------------------********---------------------------------*/
|| getField('OP_OBJ_TYPE').value=='SUMMARY_FORM') || getField('OP_OBJ_TYPE').value=='SUMMARY_FORM')
/*----------------------------------********---------------------------------*/
{ {
hideRowById( 'ALL' ); hideRowById( 'ALL' );
hideRowById( 'DYNAFORMS' ); hideRowById( 'DYNAFORMS' );

View File

@@ -174,9 +174,7 @@ leimnud.event.add(getField('OP_OBJ_TYPE'), 'change', function() {
showRowById('OP_ACTION'); showRowById('OP_ACTION');
break; break;
case 'CASES_NOTES': case 'CASES_NOTES':
/*----------------------------------********---------------------------------*/
case 'SUMMARY_FORM': case 'SUMMARY_FORM':
/*----------------------------------********---------------------------------*/
getField('ALL').value = ''; getField('ALL').value = '';
getField('DYNAFORMS').value = ''; getField('DYNAFORMS').value = '';
getField('INPUTS').value = ''; getField('INPUTS').value = '';
@@ -252,9 +250,7 @@ switch (vValue) {
showRowById('OP_ACTION'); showRowById('OP_ACTION');
break; break;
case 'CASES_NOTES': case 'CASES_NOTES':
/*----------------------------------********---------------------------------*/
case 'SUMMARY_FORM': case 'SUMMARY_FORM':
/*----------------------------------********---------------------------------*/
getField('ALL').value = ''; getField('ALL').value = '';
getField('DYNAFORMS').value = ''; getField('DYNAFORMS').value = '';
getField('INPUTS').value = ''; getField('INPUTS').value = '';

View File

@@ -48,17 +48,13 @@ var selfServiceTimeoutDataShow = function (sw)
hideRowById("TAS_SELFSERVICE_TIME"); hideRowById("TAS_SELFSERVICE_TIME");
hideRowById("TAS_SELFSERVICE_TIME_UNIT"); hideRowById("TAS_SELFSERVICE_TIME_UNIT");
hideRowById("TAS_SELFSERVICE_TRIGGER_UID"); hideRowById("TAS_SELFSERVICE_TRIGGER_UID");
/*----------------------------------********---------------------------------*/
hideRowById("TAS_SELFSERVICE_EXECUTION"); hideRowById("TAS_SELFSERVICE_EXECUTION");
/*----------------------------------********---------------------------------*/
if (sw == true) { if (sw == true) {
showRowById("TAS_SELFSERVICE_TIME"); showRowById("TAS_SELFSERVICE_TIME");
showRowById("TAS_SELFSERVICE_TIME_UNIT"); showRowById("TAS_SELFSERVICE_TIME_UNIT");
showRowById("TAS_SELFSERVICE_TRIGGER_UID"); showRowById("TAS_SELFSERVICE_TRIGGER_UID");
/*----------------------------------********---------------------------------*/
showRowById("TAS_SELFSERVICE_EXECUTION"); showRowById("TAS_SELFSERVICE_EXECUTION");
/*----------------------------------********---------------------------------*/
} }
}; };
@@ -134,9 +130,7 @@ if (aTaskFlag[1])
} }
getField("TAS_SELFSERVICE_TRIGGER_UID").value = oTaskData.TAS_SELFSERVICE_TRIGGER_UID; getField("TAS_SELFSERVICE_TRIGGER_UID").value = oTaskData.TAS_SELFSERVICE_TRIGGER_UID;
/*----------------------------------********---------------------------------*/
getField("TAS_SELFSERVICE_EXECUTION").value = oTaskData.TAS_SELFSERVICE_EXECUTION; getField("TAS_SELFSERVICE_EXECUTION").value = oTaskData.TAS_SELFSERVICE_EXECUTION;
/*----------------------------------********---------------------------------*/
showTextpm(); showTextpm();
break; break;

View File

@@ -4,9 +4,7 @@ use Illuminate\Foundation\Http\Kernel;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use ProcessMaker\Core\AppEvent; use ProcessMaker\Core\AppEvent;
use ProcessMaker\Core\JobsManager; use ProcessMaker\Core\JobsManager;
/*----------------------------------********---------------------------------*/
use ProcessMaker\ChangeLog\ChangeLog; use ProcessMaker\ChangeLog\ChangeLog;
/*----------------------------------********---------------------------------*/
use ProcessMaker\Plugins\PluginRegistry; use ProcessMaker\Plugins\PluginRegistry;
use ProcessMaker\Validation\ValidationUploadedFiles; use ProcessMaker\Validation\ValidationUploadedFiles;
@@ -307,9 +305,7 @@ if (!(array_key_exists('REMOTE_USER', $_SERVER) && (string) ($_SERVER['REMOTE_US
session_start(); session_start();
//Set Time Zone //Set Time Zone
/*----------------------------------********---------------------------------*/
$_SESSION['__SYSTEM_UTC_TIME_ZONE__'] = (int)($config['system_utc_time_zone']) == 1; $_SESSION['__SYSTEM_UTC_TIME_ZONE__'] = (int)($config['system_utc_time_zone']) == 1;
/*----------------------------------********---------------------------------*/
// Do not change any of these settings directly, use env.ini instead // Do not change any of these settings directly, use env.ini instead
ini_set('display_errors', $config['display_errors']); ini_set('display_errors', $config['display_errors']);
@@ -337,11 +333,9 @@ define('LOGS_LOCATION', $config['logs_location']);
define('LOGGING_LEVEL', $config['logging_level']); define('LOGGING_LEVEL', $config['logging_level']);
define('EXT_AJAX_TIMEOUT', $config['ext_ajax_timeout']); define('EXT_AJAX_TIMEOUT', $config['ext_ajax_timeout']);
define('TIME_ZONE', ini_get('date.timezone')); define('TIME_ZONE', ini_get('date.timezone'));
/*----------------------------------********---------------------------------*/
define('HIGHLIGHT_HOME_FOLDER_ENABLE', $config['highlight_home_folder_enable'] === "1"); define('HIGHLIGHT_HOME_FOLDER_ENABLE', $config['highlight_home_folder_enable'] === "1");
define('HIGHLIGHT_HOME_FOLDER_REFRESH_TIME', $config['highlight_home_folder_refresh_time']); define('HIGHLIGHT_HOME_FOLDER_REFRESH_TIME', $config['highlight_home_folder_refresh_time']);
define('HIGHLIGHT_HOME_FOLDER_SCOPE', $config['highlight_home_folder_scope']); define('HIGHLIGHT_HOME_FOLDER_SCOPE', $config['highlight_home_folder_scope']);
/*----------------------------------********---------------------------------*/
define('DISABLE_TASK_MANAGER_ROUTING_ASYNC', $config['disable_task_manager_routing_async'] === "1"); define('DISABLE_TASK_MANAGER_ROUTING_ASYNC', $config['disable_task_manager_routing_async'] === "1");
// IIS Compatibility, SERVER_ADDR doesn't exist on that env, so we need to define it. // IIS Compatibility, SERVER_ADDR doesn't exist on that env, so we need to define it.
@@ -722,11 +716,9 @@ Bootstrap::LoadTranslationPlugins(defined('SYS_LANG') ? SYS_LANG : "en", $attrib
// Initialization functions plugins // Initialization functions plugins
$oPluginRegistry->init(); $oPluginRegistry->init();
/*----------------------------------********---------------------------------*/
$_GET = \ProcessMaker\Util\DateTime::convertDataToUtc($_GET); $_GET = \ProcessMaker\Util\DateTime::convertDataToUtc($_GET);
$_POST = \ProcessMaker\Util\DateTime::convertDataToUtc($_POST); $_POST = \ProcessMaker\Util\DateTime::convertDataToUtc($_POST);
$_REQUEST = \ProcessMaker\Util\DateTime::convertDataToUtc($_REQUEST); $_REQUEST = \ProcessMaker\Util\DateTime::convertDataToUtc($_REQUEST);
/*----------------------------------********---------------------------------*/
Creole::registerDriver('dbarray', 'creole.contrib.DBArrayConnection'); Creole::registerDriver('dbarray', 'creole.contrib.DBArrayConnection');
@@ -1056,7 +1048,6 @@ if (!defined('EXECUTE_BY_CRON')) {
} }
$_SESSION['phpLastFileFound'] = $_SERVER['REQUEST_URI']; $_SESSION['phpLastFileFound'] = $_SERVER['REQUEST_URI'];
/*----------------------------------********---------------------------------*/
// Check if the timezone for the user is valid // Check if the timezone for the user is valid
if (!empty($_SESSION['USER_LOGGED']) && isset($_SESSION['__TIME_ZONE_FAILED__']) && $_SESSION['__TIME_ZONE_FAILED__'] && if (!empty($_SESSION['USER_LOGGED']) && isset($_SESSION['__TIME_ZONE_FAILED__']) && $_SESSION['__TIME_ZONE_FAILED__'] &&
(SYS_COLLECTION != 'login' && SYS_TARGET != 'login')) { (SYS_COLLECTION != 'login' && SYS_TARGET != 'login')) {
@@ -1089,7 +1080,6 @@ if (!defined('EXECUTE_BY_CRON')) {
G::RenderPage('publish'); G::RenderPage('publish');
exit(0); exit(0);
} }
/*----------------------------------********---------------------------------*/
// Initialization functions plugins // Initialization functions plugins
$oPluginRegistry->init(); $oPluginRegistry->init();
@@ -1110,13 +1100,13 @@ if (!defined('EXECUTE_BY_CRON')) {
} else { } else {
//NewRelic Snippet - By JHL //NewRelic Snippet - By JHL
transactionLog($phpFile); transactionLog($phpFile);
/*----------------------------------********---------------------------------*/
ChangeLog::getChangeLog() ChangeLog::getChangeLog()
->setSourceId(ChangeLog::FromWeb) ->setSourceId(ChangeLog::FromWeb)
->setSkin(SYS_SKIN) ->setSkin(SYS_SKIN)
->setLanguage(SYS_LANG) ->setLanguage(SYS_LANG)
->getUsrIdByUsrUid(empty($_SESSION['USER_LOGGED']) ? '' : $_SESSION['USER_LOGGED']); ->getUsrIdByUsrUid(empty($_SESSION['USER_LOGGED']) ? '' : $_SESSION['USER_LOGGED']);
/*----------------------------------********---------------------------------*/
ValidationUploadedFiles::getValidationUploadedFiles() ValidationUploadedFiles::getValidationUploadedFiles()
->runRulesToAllUploadedFiles(); ->runRulesToAllUploadedFiles();
require_once $phpFile; require_once $phpFile;