diff --git a/workflow/engine/templates/bpmn/pmosExt.js b/workflow/engine/templates/bpmn/pmosExt.js index 28f4fa679..4e980f92c 100755 --- a/workflow/engine/templates/bpmn/pmosExt.js +++ b/workflow/engine/templates/bpmn/pmosExt.js @@ -57,9 +57,11 @@ pmosExt.prototype.popWebEntry= function(_5678) hidden: true, handler: function(){ webForm.hide(); + editForm.getForm().reset(); editForm.getForm().findField('pro_uid').setValue(pro_uid); editForm.getForm().findField('evn_uid').setValue(evn_uid); editForm.getForm().findField('dynaform').setValue(''); + editForm.getForm().items.items[3].focus('',500); editForm.show(); newButton.disable(); } diff --git a/workflow/engine/templates/departments/departmentList.js b/workflow/engine/templates/departments/departmentList.js index 86e18bb42..91bec5ad1 100755 --- a/workflow/engine/templates/departments/departmentList.js +++ b/workflow/engine/templates/departments/departmentList.js @@ -241,7 +241,10 @@ DoNothing = function(){}; //Call New Department at Root NewRootDepartment = function(){ + newForm.getForm().reset(); newForm.getForm().findField('parent').setValue(''); + newForm.getForm().items.items[1].focus('',500); + //newForm.getForm().items.items[1].setValue(''); w = new Ext.Window({ title: _('ID_NEW_DEPARTMENT'), autoHeight: true, @@ -257,7 +260,9 @@ NewRootDepartment = function(){ //Call New Sub Department at Parent NewSubDepartment = function(){ var dep_node = Ext.getCmp('treePanel').getSelectionModel().getSelectedNode(); + newForm.getForm().reset(); newForm.getForm().findField('parent').setValue(dep_node.attributes.DEP_UID); + newForm.getForm().items.items[1].focus('',500); w = new Ext.Window({ title: _('ID_NEW_SUB_DEPARTMENT'), autoHeight: true, diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js index a6b89def4..69aa75942 100755 --- a/workflow/engine/templates/groups/groupsList.js +++ b/workflow/engine/templates/groups/groupsList.js @@ -332,6 +332,8 @@ DoNothing = function(){}; //Open New Group Form NewGroupWindow = function(){ + newForm.getForm().reset(); + newForm.getForm().items.items[0].focus('',500); w = new Ext.Window({ autoHeight: true, width: 400, diff --git a/workflow/engine/templates/processCategory/processCategoryList.js b/workflow/engine/templates/processCategory/processCategoryList.js index c38c6a5c5..b9d93cc2f 100755 --- a/workflow/engine/templates/processCategory/processCategoryList.js +++ b/workflow/engine/templates/processCategory/processCategoryList.js @@ -298,6 +298,8 @@ DoNothing = function(){}; //Open New Category Form NewCategoryWindow = function(){ + newForm.getForm().reset(); + newForm.getForm().items.items[0].focus('',500); w = new Ext.Window({ title: _('ID_NEW_CATEGORY'), autoHeight: true, diff --git a/workflow/engine/templates/roles/rolesList.js b/workflow/engine/templates/roles/rolesList.js index de1015dee..148ff3c17 100755 --- a/workflow/engine/templates/roles/rolesList.js +++ b/workflow/engine/templates/roles/rolesList.js @@ -354,6 +354,8 @@ DoNothing = function(){}; //Open New Role Form NewRoleWindow = function(){ + newForm.getForm().reset(); + newForm.getForm().items.items[0].focus('',500); w = new Ext.Window({ title: _('ID_CREATE_ROLE_TITLE'), autoHeight: true,