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();
}
diff --git a/workflow/engine/templates/installer/installer_cards.js b/workflow/engine/templates/installer/installer_cards.js
index f9e741b0a..e407ec035 100644
--- a/workflow/engine/templates/installer/installer_cards.js
+++ b/workflow/engine/templates/installer/installer_cards.js
@@ -207,10 +207,10 @@ 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);
+ Ext.get('database_message').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg);
var dbFlag = ((!response.wfDatabaseExists) || Ext.getCmp('deleteDB').getValue());
wizard.onClientValidation(4, dbFlag);
@@ -784,7 +784,7 @@ Ext.onReady(function(){
}),
{
xtype : 'textfield',
- fieldLabel: _('ID_WF_DATABASE_NAME') + ' ',
+ fieldLabel: _('ID_WF_DATABASE_NAME'),
id : 'wfDatabase',
value :'wf_workflow',
allowBlank : false,
@@ -799,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',