From 4871bd2b4f385eb76490ae36f4c9e700faf6a204 Mon Sep 17 00:00:00 2001 From: marcelo Date: Fri, 12 Apr 2013 10:47:05 -0400 Subject: [PATCH 01/10] BUG 11086 "Rows are being ignored after adding them next to an empty row" SOLVED -When you try to add a row into a pmTable, if you leave an empty row the next added rows are being ignored and not saved. -Solved, The final user cant leave a row without at least the primary keys columns filled up, to be saved. --- workflow/engine/templates/pmTables/data.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index 2107a9376..1d243f4ee 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -89,6 +89,11 @@ Ext.onReady(function(){ _fields.push({name: _idProperty}); for (i=0;i Date: Mon, 15 Apr 2013 10:35:12 -0400 Subject: [PATCH 02/10] BUG 11086 "Rows are being ignored after adding them next to an empty row" SOLVED -When you try to add a row into a pmTable, if you leave an empty row the next added rows are being ignored and not saved. -Solved, The final user cant leave a row without at least the primary keys columns filled up, to be saved and if by accident the user leaves an empty row the aplication shows up an error message. --- workflow/engine/templates/pmTables/data.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index 1d243f4ee..8f76d74c2 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -188,7 +188,8 @@ Ext.onReady(function(){ editor = new Ext.ux.grid.RowEditor({ saveText : _("ID_UPDATE"), listeners : { - + beforeedit:function(){ + } } }); } @@ -213,10 +214,10 @@ Ext.onReady(function(){ return false; - PMExt.error(_('ID_ERROR'), msg); + PMExt.error(_('ID_ERROR'), msg); infoGrid.store.reload(); }); - + E var proxy = new Ext.data.HttpProxy({ //url: '../pmTablesProxy/getData?id=' + tableDef.ADD_TAB_UID api: { @@ -397,12 +398,17 @@ NewPMTableRow = function(){ var row = new PMRow(new props); len = infoGrid.getStore().data.length; + if (infoGrid.store.getAt(len-1).data[tableDef.FIELDS[0].FLD_NAME]=="") { + PMExt.error( _('ID_ERROR'), _('ID_EMPTY_ROW')); + store.load(); + } else{ - editor.stopEditing(); - store.insert(len, row); - infoGrid.getView().refresh(); - infoGrid.getSelectionModel().selectRow(len); - editor.startEditing(len); + editor.stopEditing(); + store.insert(len, row); + infoGrid.getView().refresh(); + infoGrid.getSelectionModel().selectRow(len); + editor.startEditing(len); + } }; //Load PM Table Edition Row Form From d7eac27fb5e83bc728c0f2183b7e024d1c5360ba Mon Sep 17 00:00:00 2001 From: marcelo Date: Mon, 15 Apr 2013 15:00:06 -0400 Subject: [PATCH 03/10] BUG 11086 "Rows are being ignored after adding them next to an empty row" SOLVED -When you try to add a row into a pmTable, if you leave an empty row the next added rows are being ignored and not saved. -Solved, The final user cant leave a row without at least the primary keys columns filled up, to be saved and if by accident the user leaves an empty row the aplication shows up an error message. --- workflow/engine/templates/pmTables/data.js | 1 - 1 file changed, 1 deletion(-) diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index 8f76d74c2..0d5fba342 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -217,7 +217,6 @@ Ext.onReady(function(){ PMExt.error(_('ID_ERROR'), msg); infoGrid.store.reload(); }); - E var proxy = new Ext.data.HttpProxy({ //url: '../pmTablesProxy/getData?id=' + tableDef.ADD_TAB_UID api: { From 9bc2c87bd072269896e66075ac38ba72f7c02129 Mon Sep 17 00:00:00 2001 From: marcelo Date: Mon, 15 Apr 2013 15:22:30 -0400 Subject: [PATCH 04/10] BUG 11086 "Rows are being ignored after adding them next to an empty row" SOLVED -When you try to add a row into a pmTable, if you leave an empty row the next added rows are being ignored and not saved. -Solved, The final user cant leave a row without at least the primary keys columns filled up, to be saved and if by accident the user leaves an empty row the aplication shows up an error message. --- workflow/engine/templates/pmTables/data.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index 0d5fba342..64a207037 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -397,11 +397,18 @@ NewPMTableRow = function(){ var row = new PMRow(new props); len = infoGrid.getStore().data.length; - if (infoGrid.store.getAt(len-1).data[tableDef.FIELDS[0].FLD_NAME]=="") { - PMExt.error( _('ID_ERROR'), _('ID_EMPTY_ROW')); - store.load(); + if (len>0) { + if (infoGrid.store.getAt(len-1).data[tableDef.FIELDS[0].FLD_NAME]=="") { + PMExt.error( _('ID_ERROR'), _('ID_EMPTY_ROW')); + store.load(); + } else{ + editor.stopEditing(); + store.insert(len, row); + infoGrid.getView().refresh(); + infoGrid.getSelectionModel().selectRow(len); + editor.startEditing(len); + } } else{ - editor.stopEditing(); store.insert(len, row); infoGrid.getView().refresh(); From 82425aad5a430056e0804db0530bc509c99b1867 Mon Sep 17 00:00:00 2001 From: marcelo Date: Mon, 15 Apr 2013 16:06:15 -0400 Subject: [PATCH 05/10] BUG 11086 "Rows are being ignored after adding them next to an empty row" SOLVED -When you try to add a row into a pmTable, if you leave an empty row the next added rows are being ignored and not saved. -Solved, The final user cant leave a row without at least the primary keys columns filled up, to be saved and if by accident the user leaves an empty row the aplication shows up an error message. --- workflow/engine/templates/pmTables/data.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index 64a207037..b2976e40e 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -398,7 +398,13 @@ NewPMTableRow = function(){ var row = new PMRow(new props); len = infoGrid.getStore().data.length; if (len>0) { - if (infoGrid.store.getAt(len-1).data[tableDef.FIELDS[0].FLD_NAME]=="") { + var emptyrow=0; + for (var i = 0; i < tableDef.FIELDS.length; i++) { + if (infoGrid.store.getAt(len-1).data[tableDef.FIELDS[i].FLD_NAME]=="") { + emptyrow++; + }; + }; + if (emptyrow==tableDef.FIELDS.length) { PMExt.error( _('ID_ERROR'), _('ID_EMPTY_ROW')); store.load(); } else{ From 1b25d0f4abca76fca96454305375ac6929a8e4cc Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Mon, 15 Apr 2013 21:13:09 +0000 Subject: [PATCH 06/10] BUG 0000 "Problema al editar perfil de usuario en..." SOLVED - Problema al editar perfil de usuario en Preferences Dropdown Default Cases Menu Option. - Problema resuelto, cuando se selecciona Home del Dropdown Default Main Menu Option, el Dropdown Default Cases Menu Option ahora esta habilitado * Available from version ProcessMaker-2.0.47 (2.5.1) --- workflow/engine/templates/users/users.js | 53 +++++++++++++----------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index 7ebc5ef20..763f2eaa2 100644 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -1249,31 +1249,6 @@ function loadUserData() // } - storeCountry.load(); - - storeRegion.load({ - params: { - IC_UID : data.user.USR_COUNTRY - } - }); - - storeLocation.load({ - params: { - IC_UID : data.user.USR_COUNTRY, - IS_UID : data.user.USR_CITY - } - }); - - storeReplacedBy.load(); - - storeCalendar.load(); - - storeRole.load(); - - storeDefaultMainMenuOption.load(); - - storeDefaultCasesMenuOption.load(); - comboCountry.store.on("load", function(store) { comboCountry.setValue(data.user.USR_COUNTRY); }); @@ -1306,12 +1281,15 @@ function loadUserData() if (infoMode) { comboDefaultMainMenuOption.store.on("load", function (store) { comboDefaultMainMenuOption.setValue(data.user.PREF_DEFAULT_MENUSELECTED); + + storeDefaultCasesMenuOption.load(); }); comboDefaultCasesMenuOption.store.on("load", function (store) { if (comboDefaultMainMenuOption.getValue() == 'PM_CASES') { comboDefaultCasesMenuOption.enable(); } + comboDefaultCasesMenuOption.setValue(data.user.PREF_DEFAULT_CASES_MENUSELECTED); }); } else { @@ -1325,6 +1303,31 @@ function loadUserData() } previousUsername = Ext.getCmp("USR_USERNAME").getValue(); + + storeCountry.load(); + + storeRegion.load({ + params: { + IC_UID : data.user.USR_COUNTRY + } + }); + + storeLocation.load({ + params: { + IC_UID : data.user.USR_COUNTRY, + IS_UID : data.user.USR_CITY + } + }); + + storeReplacedBy.load(); + + storeCalendar.load(); + + storeRole.load(); + + storeDefaultMainMenuOption.load(); + + //storeDefaultCasesMenuOption.load(); }, failure: function (r, o) { //viewport.getEl().unmask(); From 7e43974f8ba078f4341990f63acc7a85675a4105 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Wed, 17 Apr 2013 08:48:06 -0400 Subject: [PATCH 07/10] Change comment for Talend class --- workflow/engine/classes/triggers/class.pmTalendFunctions.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/triggers/class.pmTalendFunctions.php b/workflow/engine/classes/triggers/class.pmTalendFunctions.php index 138496ca6..47c1bf968 100755 --- a/workflow/engine/classes/triggers/class.pmTalendFunctions.php +++ b/workflow/engine/classes/triggers/class.pmTalendFunctions.php @@ -28,7 +28,9 @@ /** * - * @method Executes a Talend Web Service.. + * @method + * + * Executes a Talend Web Service.. * * @name executeTalendWebservice * @label Executes a Talend Web Service. From d6d27b28b3d1fd3d3cfdc537fa1cd385285532e1 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Wed, 17 Apr 2013 10:06:51 -0400 Subject: [PATCH 08/10] DOC SYSTEM Arreglo para el instalador de docSystem Arreglo para el instalador de docSystem --- workflow/engine/controllers/installer.php | 106 ++++++++++++---------- workflow/engine/methods/services/soap.php | 9 ++ 2 files changed, 65 insertions(+), 50 deletions(-) diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 81a806923..cae77de91 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -363,8 +363,9 @@ class Installer extends Controller */ public function createWorkspace () { - if (file_exists($this->path_shared . 'partner.info')) { - $_REQUEST['PARTNER_FLAG'] = true; + $pathSharedPartner = trim( $_REQUEST['pathShared'] ); + if (file_exists($pathSharedPartner.'partner.info')) { + $_REQUEST['PARTNER_FLAG'] = true; } $this->setResponseType( 'json' ); if ($_REQUEST['db_engine'] == 'mysql') { @@ -838,19 +839,20 @@ class Installer extends Controller // getting configuration from env.ini $sysConf = System::getSystemConfiguration( $envFile ); + try { + // update the main index file + $indexFileUpdated = System::updateIndexFile( array ('lang' => 'en','skin' => $updatedConf['default_skin'] + ) ); + } catch (Exception $e) { + $info->result = false; + $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array(PATH_HTML . "index.html.")); + $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL'); + $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('index.html'))); + return $info; + } + if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) { - $this->buildParternExtras($db_username, $db_password, $_REQUEST['workspace'], SYS_LANG); - } else { - try { - // update the main index file - $indexFileUpdated = System::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin'])); - } catch (Exception $e) { - $info->result = false; - $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array(PATH_HTML . "index.html.")); - $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL'); - $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('index.html'))); - return $info; - } + $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], SYS_LANG); } $this->installLog( G::LoadTranslation('ID_INDEX_FILE_UPDATED', SYS_LANG, Array($indexFileUpdated, $sysConf['default_lang'],$sysConf['default_skin']))); @@ -1336,9 +1338,9 @@ class Installer extends Controller $user = urlencode($username); $pass = urlencode($password); $lang = urlencode($lang); - + $ch = curl_init(); - + // set URL and other appropriate options curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/login/authentication"); curl_setopt($ch, CURLOPT_HEADER, 0); @@ -1349,7 +1351,7 @@ class Installer extends Controller curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POSTFIELDS, "form[USR_USERNAME]=$user&form[USR_PASSWORD]=$pass&form[USER_LANG]=$lang"); curl_setopt($ch, CURLOPT_TIMEOUT, 90); - + $output = curl_exec($ch); curl_close($ch); @@ -1358,10 +1360,11 @@ class Installer extends Controller */ $ch = curl_init(); + $postData = array(); // File to upload/post $postData['form[LANGUAGE_FILENAME]'] = "@".PATH_CORE."content/translations/processmaker.$lang.po"; - + curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/languages_Import"); curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_VERBOSE, 0); @@ -1372,41 +1375,16 @@ class Installer extends Controller curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); curl_setopt($ch, CURLOPT_TIMEOUT, 90); - - + $output = curl_exec($ch); curl_close($ch); /** - * Upload plugin file + * Upload skin file */ $ch = curl_init(); - - // resolv the plugin name - $plugins = glob(PATH_CORE."plugins/*.tar"); - if (count($plugins) > 0) { - $pluginName = $plugins[0]; - - // File to upload/post - $postData['form[PLUGIN_FILENAME]'] = "@{$pluginName}"; - //http://pmos/sysworkflow/en/classic/setup/skin_Ajax - curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/pluginsImportFile"); - curl_setopt($ch, CURLOPT_HEADER, 0); - curl_setopt($ch, CURLOPT_VERBOSE, 0); - curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiefile); - curl_setopt($ch, CURLOPT_COOKIEJAR, $cookiefile); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false); - curl_setopt($ch, CURLOPT_POST, true); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); - curl_setopt($ch, CURLOPT_TIMEOUT, 90); - - $output = curl_exec($ch); - curl_close($ch); - } - - $ch = curl_init(); + $postData = array(); $skins = glob(PATH_CORE."data/partner/*.tar"); if (count($skins) > 0) { @@ -1418,7 +1396,7 @@ class Installer extends Controller $postData['action'] = "importSkin"; // File to upload/post $postData['uploadedFile'] = "@".$skin; - + curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/skin_Ajax"); curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_VERBOSE, 0); @@ -1429,12 +1407,40 @@ class Installer extends Controller curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); curl_setopt($ch, CURLOPT_TIMEOUT, 90); - - echo $output = curl_exec($ch); + + $output = curl_exec($ch); + curl_close($ch); + } + + /** + * Upload plugin file + */ + + $ch = curl_init(); + $postData = array(); + // resolv the plugin name + $plugins = glob(PATH_CORE."plugins/*.tar"); + if (count($plugins) > 0) { + $pluginName = $plugins[0]; + + // File to upload/post + $postData['form[PLUGIN_FILENAME]'] = "@{$pluginName}"; + curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/pluginsImportFile"); + curl_setopt($ch, CURLOPT_HEADER, 0); + curl_setopt($ch, CURLOPT_VERBOSE, 0); + curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiefile); + curl_setopt($ch, CURLOPT_COOKIEJAR, $cookiefile); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false); + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); + curl_setopt($ch, CURLOPT_TIMEOUT, 90); + + + $output = curl_exec($ch); curl_close($ch); } } } - diff --git a/workflow/engine/methods/services/soap.php b/workflow/engine/methods/services/soap.php index c0e0f4ec4..ebfbc9af4 100755 --- a/workflow/engine/methods/services/soap.php +++ b/workflow/engine/methods/services/soap.php @@ -1,4 +1,13 @@ buildParternExtras('admin', 'sample', 'workflow', 'pt-BR'); + + +die; + ini_set( "soap.wsdl_cache_enabled", "0" ); // disabling WSDL cache From 545c46529fcd9b640872a930bc169411be1b509a Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Wed, 17 Apr 2013 10:25:32 -0400 Subject: [PATCH 09/10] DOC SYSTEM Arreglo para el instalador de docSystem Arreglo para el instalador de docSystem --- workflow/engine/controllers/installer.php | 29 +++++++++++------------ workflow/engine/methods/services/soap.php | 9 ------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index cae77de91..9eaefd320 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -839,20 +839,19 @@ class Installer extends Controller // getting configuration from env.ini $sysConf = System::getSystemConfiguration( $envFile ); - try { - // update the main index file - $indexFileUpdated = System::updateIndexFile( array ('lang' => 'en','skin' => $updatedConf['default_skin'] - ) ); - } catch (Exception $e) { - $info->result = false; - $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array(PATH_HTML . "index.html.")); - $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL'); - $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('index.html'))); - return $info; - } - if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) { $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], SYS_LANG); + } else { + try { + // update the main index file + $indexFileUpdated = System::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin'])); + } catch (Exception $e) { + $info->result = false; + $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array(PATH_HTML . "index.html.")); + $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL'); + $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('index.html'))); + return $info; + } } $this->installLog( G::LoadTranslation('ID_INDEX_FILE_UPDATED', SYS_LANG, Array($indexFileUpdated, $sysConf['default_lang'],$sysConf['default_skin']))); @@ -1406,16 +1405,16 @@ class Installer extends Controller curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); - curl_setopt($ch, CURLOPT_TIMEOUT, 90); + curl_setopt($ch, CURLOPT_TIMEOUT, 90); $output = curl_exec($ch); curl_close($ch); } - /** + /** * Upload plugin file */ - + $ch = curl_init(); $postData = array(); // resolv the plugin name diff --git a/workflow/engine/methods/services/soap.php b/workflow/engine/methods/services/soap.php index ebfbc9af4..c0e0f4ec4 100755 --- a/workflow/engine/methods/services/soap.php +++ b/workflow/engine/methods/services/soap.php @@ -1,13 +1,4 @@ buildParternExtras('admin', 'sample', 'workflow', 'pt-BR'); - - -die; - ini_set( "soap.wsdl_cache_enabled", "0" ); // disabling WSDL cache From 2cdef5d4fa6ef02b9bca43494a534668a07171d0 Mon Sep 17 00:00:00 2001 From: marcelo Date: Wed, 17 Apr 2013 10:57:12 -0400 Subject: [PATCH 10/10] BUG 11086 "Cases list search doesnt work when a text is added on the filters" SOLVED -On "Category", "Process", "User" and "Delegate date" filters, its posible to add any text on its fields and the search doesnt work with this texts. -Solved, The final user cant add any kind of text to the filters but to choose one option listed on them, so the search works with this values. --- workflow/engine/templates/cases/casesList.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 69aa8fa1c..47c7bbe44 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -865,7 +865,7 @@ Ext.onReady ( function() { var comboProcess = new Ext.form.ComboBox({ width : 180, boxMaxWidth : 200, - editable : true, + editable : false, displayField : 'APP_PRO_TITLE', valueField : 'PRO_UID', forceSelection: false, @@ -941,7 +941,7 @@ Ext.onReady ( function() { var comboCategory = new Ext.form.ComboBox({ width : 180, boxMaxWidth : 200, - editable : true, + editable : false, displayField : 'CATEGORY_NAME', valueField : 'CATEGORY_UID', forceSelection : false, @@ -1108,7 +1108,7 @@ Ext.onReady ( function() { triggerAction : 'all', emptyText : _('ID_ALL_USERS'), selectOnFocus : true, - editable : true, + editable : false, width: 180, allowBlank : true, autocomplete: true, @@ -1500,6 +1500,7 @@ Ext.onReady ( function() { id:'dateFrom', format: 'Y-m-d', width: 120, + editable: false, value: '' }); @@ -1507,6 +1508,7 @@ Ext.onReady ( function() { id:'dateTo', format: 'Y-m-d', width: 120, + editable: false, value: '' });