From 6ff6f7ff2731f843a895b42fd2e7c7dc878f1f68 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Tue, 21 Apr 2015 17:15:36 -0400 Subject: [PATCH 1/3] =?UTF-8?q?PM-2255=20Error=20de=20escritura=20en=20el?= =?UTF-8?q?=20mensaje.=20Causa=20:=20Definida=20asi=20en=20su=20construcci?= =?UTF-8?q?=C3=B3Soluci=C3=B3=20Se=20cambio=20la=20descripcion=20de=20los?= =?UTF-8?q?=20labels=20tal=20com=20se=20indica.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/templates/installer/installer_cards.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/workflow/engine/templates/installer/installer_cards.js b/workflow/engine/templates/installer/installer_cards.js index f9e741b0a..27b3f22d8 100644 --- a/workflow/engine/templates/installer/installer_cards.js +++ b/workflow/engine/templates/installer/installer_cards.js @@ -207,8 +207,8 @@ Ext.onReady(function(){ Ext.Ajax.request({ url: 'checkDatabases', success: function(response){ - var existMsg = '' + _('ID_EXIST') + ''; - var noExistsMsg = '' + _('ID_NO_EXIST') + ''; + var existMsg = '' + _('ID_NOT_AVAILABLE_DATABASE') + ''; + var noExistsMsg = '' + _('ID_AVAILABLE_DATABASE') + ''; var response = Ext.util.JSON.decode(response.responseText); Ext.get('wfDatabaseSpan').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg); @@ -784,11 +784,12 @@ Ext.onReady(function(){ }), { xtype : 'textfield', - fieldLabel: _('ID_WF_DATABASE_NAME') + ' ', + fieldLabel: _('ID_WF_DATABASE_NAME') + ':
' + ' ', id : 'wfDatabase', value :'wf_workflow', allowBlank : false, maxLength: 32, + labelSeparator : "", validator : function(v){ var t = /^[a-zA-Z_0-9]+$/; return t.test(v); From 2fd192a5ccf4563fbcf908b9039b4d6cd6044111 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Wed, 22 Apr 2015 10:29:24 -0400 Subject: [PATCH 2/3] =?UTF-8?q?PM-2255=20Error=20de=20escritura=20en=20el?= =?UTF-8?q?=20mensaje.=20Causa=20:=20Definida=20asi=20en=20su=20construcci?= =?UTF-8?q?=C3=B3Soluci=C3=B3=20Se=20cambio=20la=20descripcion=20de=20los?= =?UTF-8?q?=20labels=20tal=20com=20se=20indica.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/templates/installer/installer_cards.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/workflow/engine/templates/installer/installer_cards.js b/workflow/engine/templates/installer/installer_cards.js index 27b3f22d8..e407ec035 100644 --- a/workflow/engine/templates/installer/installer_cards.js +++ b/workflow/engine/templates/installer/installer_cards.js @@ -210,7 +210,7 @@ Ext.onReady(function(){ var existMsg = '' + _('ID_NOT_AVAILABLE_DATABASE') + ''; var noExistsMsg = '' + _('ID_AVAILABLE_DATABASE') + ''; var response = Ext.util.JSON.decode(response.responseText); - Ext.get('wfDatabaseSpan').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg); + Ext.get('database_message').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg); var dbFlag = ((!response.wfDatabaseExists) || Ext.getCmp('deleteDB').getValue()); wizard.onClientValidation(4, dbFlag); @@ -784,12 +784,11 @@ Ext.onReady(function(){ }), { xtype : 'textfield', - fieldLabel: _('ID_WF_DATABASE_NAME') + ':
' + ' ', + fieldLabel: _('ID_WF_DATABASE_NAME'), id : 'wfDatabase', value :'wf_workflow', allowBlank : false, maxLength: 32, - labelSeparator : "", validator : function(v){ var t = /^[a-zA-Z_0-9]+$/; return t.test(v); @@ -800,6 +799,10 @@ Ext.onReady(function(){ wizard.onClientValidation(4, false); }} }, + { + xtype : 'displayfield', + id : 'database_message' + }, new Ext.form.Checkbox({ boxLabel : _('ID_DELETE_DATABASES'), id : 'deleteDB', From d9b1c9b019a301a52c9634cfd6ff89cfae2a93b4 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Fri, 24 Apr 2015 14:34:06 -0400 Subject: [PATCH 3/3] PM-2316 Admin>Settings>Users: En Grupos y Departamentos al querer crear con espacios en blanco no despliega mensaje de campos requerido se aumento validacion y mensaje --- workflow/engine/templates/departments/departmentList.js | 5 +++++ workflow/engine/templates/groups/groupsList.js | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/workflow/engine/templates/departments/departmentList.js b/workflow/engine/templates/departments/departmentList.js index 1d39938e4..a1e21b5ea 100755 --- a/workflow/engine/templates/departments/departmentList.js +++ b/workflow/engine/templates/departments/departmentList.js @@ -317,6 +317,11 @@ CloseWindow = function(){ Ext.getCmp('w').hide(); }; SaveNewDepartment = function(){ + if( newForm.getForm().findField('dep_name').getValue().trim() == "") { + Ext.Msg.alert(_('ID_WARNING'), _("ID_FIELD_REQUIRED", _("ID_DEPARTMENT_NAME"))); + newForm.getForm().findField('dep_name').setValue(""); + return false; + } waitLoading.show(); var dep_node = Ext.getCmp('treePanel').getSelectionModel().getSelectedNode(); if (dep_node) dep_node.unselect(); diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js index 2844375d7..1b38439bc 100755 --- a/workflow/engine/templates/groups/groupsList.js +++ b/workflow/engine/templates/groups/groupsList.js @@ -182,7 +182,13 @@ Ext.onReady(function(){ text: _("ID_SAVE"), handler: function (btn, ev) { - Ext.getCmp("btnCreateSave").setDisabled(true); + if( newForm.getForm().findField('name').getValue().trim() == "") { + Ext.Msg.alert(_('ID_WARNING'), _("ID_FIELD_REQUIRED", _("ID_GROUP_NAME"))); + newForm.getForm().findField('name').setValue(""); + return false; + } else { + Ext.getCmp("btnCreateSave").setDisabled(true); + } SaveNewGroupAction(); }