From c9488bfe99f5fc73d8fb5badbd6a8d429bb48049 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Mon, 23 Feb 2015 10:07:11 -0400 Subject: [PATCH 1/5] PM-1310 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Al copiar una carpeta que tiene contenido se despliega un warning por cada archivo que contiene y no desaparece el cuadro de dialogo con la direccióe la copia Se valido que antes de copiar el directorio, este exista, de lo contrario crea el directorio --- workflow/engine/methods/appFolder/appFolderAjax.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index 4f6dafa7f..c6aa461ac 100755 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/workflow/engine/methods/appFolder/appFolderAjax.php @@ -1409,6 +1409,10 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder) //Copy file $arrayPathFromFile = G::getPathFromFileUID($docInfo["APP_UID"], $docUid); $newFile = $arrayPathFromFile[0] . PATH_SEP . $arrayPathFromFile[1] . "_" . $docInfo["DOC_VERSION"] . "." . $extension; + + if(!file_exists($path . $arrayPathFromFile[0])) { + mkdir( $path . $arrayPathFromFile[0], 0777, true ); + } copy($path . $originFile, $path . $newFile); } else { From fb5562fc72107d881ef40b0cd7798d8ef386e16b Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 23 Feb 2015 11:09:57 -0400 Subject: [PATCH 2/5] I added some validations by PM-1544 --- workflow/engine/classes/class.derivation.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 390255c56..895b06998 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -176,14 +176,14 @@ class Derivation } $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); - + $flagDefault = false; while ($rsCriteria->next()) { $arrayRouteData = G::array_merges($rsCriteria->getRow(), $arrayData); if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) { $arrayNextTaskDefault = $arrayRouteData; - $arrayNextTask = array(); - break; + $flagDefault = true; + continue; } $flagContinue = true; @@ -216,7 +216,9 @@ class Derivation $arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData); } } - + if($flagDefault && !$flagContinue){ + $arrayNextTask = array(); + } if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) { $arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault); } From 8cfdfb86ebd265b9f9cbfd167a62cf5ceff4850d Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Mon, 23 Feb 2015 17:33:04 -0400 Subject: [PATCH 3/5] PM-1573 "Boton ID_IMPORT_BPMN dentro del designer..." > Code Issue: Boton ID_IMPORT_BPMN dentro del designer, solo es mostrado en Firefox > Solution: En Home existe dos botones "Import" e "Import BPMN", se quita el boton "Import BPMN" quedanto solo un boton el cual permite realizar la importacion de los procesos de tipo pmx y bpmn tal como se hacia anteriormente. --- workflow/engine/templates/processes/main.js | 275 ++++++++------------ 1 file changed, 108 insertions(+), 167 deletions(-) diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 3cc401305..271be285b 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -67,7 +67,7 @@ Ext.onReady(function(){ /*----------------------------------********---------------------------------*/ ,{name : "PRO_TYPE_PROCESS", type: "string"} /*----------------------------------********---------------------------------*/ - ,{name : "PRO_UPDATE_DATE"} + ,{name : "PRO_UPDATE_DATE"} ] }), @@ -308,14 +308,6 @@ Ext.onReady(function(){ importProcessGlobal.processFileType = "pm"; importProcess(); } - },{ - text: _('ID_IMPORT_BPMN'), - iconCls: 'silk-add', - icon: '/images/import.gif', - handler : function(){ - importProcessGlobal.processFileType = "bpmn"; - importProcessBpmn(); - } },{ xtype: 'tbfill' },{ @@ -1183,7 +1175,7 @@ importProcess = function() var processFileTypeTitle = (processFileType == "pm") ? "" : " " + processFileType; var w = new Ext.Window({ - id : 'importProcessWindow', + id : 'importProcessWindow', title : _('ID_IMPORT_PROCESS')+processFileTypeTitle, width : 420, height : 130, @@ -1217,6 +1209,10 @@ importProcess = function() name : 'processFileType', xtype : 'hidden', value : processFileType + },{ + name: "createMode", + xtype: "hidden", + value: "create" }, { xtype : 'fileuploadfield', id : 'form-file', @@ -1232,92 +1228,109 @@ importProcess = function() buttons : [{ text : _('ID_UPLOAD'), handler : function(){ - var uploader = Ext.getCmp('uploader'); - if (uploader.getForm().isValid()) { - uploader.getForm().submit({ - url : 'processes_Import_Ajax', - waitMsg : _('ID_UPLOADING_PROCESS_FILE'), - waitTitle : " ", - success : function(o, resp) { + var arrayMatch = []; - var resp_ = Ext.util.JSON.decode(resp.response.responseText); + if ((arrayMatch = eval("/^.+\.(pm|pmx|bpmn)$/i").exec(Ext.getCmp("form-file").getValue()))) { + var fileExtension = arrayMatch[1]; - if (resp_.status) { - if (resp_.status == "DISABLED-CODE") { - Ext.MessageBox.show({ - title: _("ID_ERROR"), - msg: "
" + stringReplace("\\x0A", "
", resp_.message) + "
", //\n 10 - icon: Ext.MessageBox.ERROR, - buttons: Ext.MessageBox.OK - }); + switch (fileExtension) { + case "pm": + case "pmx": + var uploader = Ext.getCmp("uploader"); - return; - } + if (uploader.getForm().isValid()) { + uploader.getForm().submit({ + url : "processes_Import_Ajax", + waitMsg : _("ID_UPLOADING_PROCESS_FILE"), + waitTitle: " ", + success: function(o, resp) + { + var resp_ = Ext.util.JSON.decode(resp.response.responseText); + + if (resp_.status) { + if (resp_.status == "DISABLED-CODE") { + Ext.MessageBox.show({ + title: _("ID_ERROR"), + msg: "
" + stringReplace("\\x0A", "
", resp_.message) + "
", //\n 10 + icon: Ext.MessageBox.ERROR, + buttons: Ext.MessageBox.OK + }); + + return; + } + } + + if (resp_.catchMessage == "") { + if (resp_.ExistProcessInDatabase == "0") { + if (resp_.ExistGroupsInDatabase == "0") { + var sNewProUid = resp_.sNewProUid; + + if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") { + if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) { + if (typeof(winDesigner) == "undefined" || winDesigner.closed){ + winDesigner = window.open( + "../designer?prj_uid=" + sNewProUid, + "winDesigner" + ); + + w.close(); + processesGrid.store.reload(); + } else { + PMExt.error( _("ID_FAILED"), _("PROCESS_ALREADY_OPENED")); + } + } else { + window.location.href = "../designer?prj_uid=" + sNewProUid; + } + } else { + window.location.href = "processes_Map?PRO_UID=" + sNewProUid; + } + } else { + importProcessGlobal.sNewProUid = resp_.sNewProUid; + importProcessGlobal.proFileName = resp_.proFileName; + importProcessGlobal.groupBeforeAccion = resp_.groupBeforeAccion; + importProcessExistGroup(); + } + } else if (resp_.ExistProcessInDatabase == "1") { + importProcessGlobal.proFileName = resp_.proFileName; + importProcessExistProcess(); + } + } else { + w.close(); + + Ext.MessageBox.show({ + title : "", + msg : resp_.catchMessage, + buttons: Ext.MessageBox.OK, + animEl : "mb9", + fn : function(){}, + icon : Ext.MessageBox.ERROR + }); + } + }, + failure : function(o, resp) + { + w.close(); + + Ext.MessageBox.show({ + title : "", + msg : resp.catchMessage, + buttons: Ext.MessageBox.OK, + animEl : "mb9", + fn : function(){}, + icon : Ext.MessageBox.ERROR + }); + } + }); + } + break; + case "bpmn": + importProcessGlobal.processFileType = "bpmn"; + importProcessBpmnSubmit(); + break; } - - if (resp_.catchMessage == "") { - if (resp_.ExistProcessInDatabase == "0") { - if (resp_.ExistGroupsInDatabase == "0") { - var sNewProUid = resp_.sNewProUid; - - if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") { - if ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) { - if (typeof(winDesigner) == "undefined" || winDesigner.closed){ - winDesigner = window.open( - "../designer?prj_uid=" + sNewProUid, - 'winDesigner' - ); - w.close(); - processesGrid.store.reload(); - } else { - PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED')); - } - } else { - window.location.href = "../designer?prj_uid=" + sNewProUid; - } - } else { - window.location.href = "processes_Map?PRO_UID=" + sNewProUid; - } - } - else { - importProcessGlobal.sNewProUid = resp_.sNewProUid; - importProcessGlobal.proFileName = resp_.proFileName; - importProcessGlobal.groupBeforeAccion = resp_.groupBeforeAccion; - importProcessExistGroup(); - } - } - else if (resp_.ExistProcessInDatabase == "1") { - - importProcessGlobal.proFileName = resp_.proFileName; - importProcessExistProcess(); - } - } - else { - w.close(); - Ext.MessageBox.show({ - title : '', - msg : resp_.catchMessage, - buttons : Ext.MessageBox.OK, - animEl : 'mb9', - fn : function(){}, - icon : Ext.MessageBox.ERROR - }); - } - }, - failure : function(o, resp) { - w.close(); - - Ext.MessageBox.show({ - title : '', - msg : resp.catchMessage, - buttons : Ext.MessageBox.OK, - animEl : 'mb9', - fn : function(){}, - icon : Ext.MessageBox.ERROR - }); - } - }); - } + } else { + Ext.MessageBox.alert(_("ID_ERROR"), _("ID_FILE_UPLOAD_INCORRECT_EXTENSION")); + } } },{ text: _('ID_CANCEL'), @@ -1330,78 +1343,6 @@ importProcess = function() }); w.show(); } - -importProcessBpmn = function () -{ - var w = new Ext.Window({ - id: 'import_process_bpmn', - title: _('ID_IMPORT_PROCESS'), - width: 420, - height: 130, - modal: true, - autoScroll: false, - maximizable: false, - resizable: false, - items: [ - new Ext.FormPanel({ - id: 'uploader', - fileUpload: true, - width: 400, - height: 90, - frame: true, - title: _('ID_IMPORT_PROCESS'), - header: false, - autoHeight: false, - bodyStyle: 'padding: 10px 10px 0 10px;', - labelWidth: 50, - defaults: { - anchor: '90%', - allowBlank: false, - msgTarget: 'side' - }, - items: [ - { - name: 'ajaxAction', - xtype: 'hidden', - value: 'uploadFileNewProcess' - }, { - name: 'processFileType', - xtype: 'hidden', - value: importProcessGlobal.processFileType - },{ - name: 'createMode', - xtype: 'hidden', - value: 'create' - }, { - xtype: 'fileuploadfield', - id: 'form-file', - emptyText: _('ID_SELECT_PROCESS_FILE'), - fieldLabel: _('ID_LAN_FILE'), - name: 'PROCESS_FILENAME', - buttonText: '', - buttonCfg: { - iconCls: 'upload-icon' - } - } - ], - buttons: [ - { - text: _('ID_UPLOAD'), - handler: function () { - importProcessBpmnSubmit(); - } - }, { - text: _('ID_CANCEL'), - handler: function () { - w.close(); - } - } - ] - }) - ] - }); - w.show(); -} var windowbpmnoption = new Ext.Window({ title: _('ID_IMPORT_PROCESS'), @@ -1447,7 +1388,7 @@ var windowbpmnoption = new Ext.Window({ }, { text: _('ID_CANCEL'), handler: function () { - Ext.getCmp('import_process_bpmn').close(); + Ext.getCmp('importProcessWindow').close(); windowbpmnoption.hide(); } } @@ -1480,7 +1421,7 @@ importProcessBpmnSubmit = function () { windowbpmnoption.show(); return; } - Ext.getCmp('import_process_bpmn').close(); + Ext.getCmp('importProcessWindow').close(); var stringxml = document.createElement("input"); stringxml.type = "hidden"; stringxml.name = "stringBpmn"; @@ -1494,7 +1435,7 @@ importProcessBpmnSubmit = function () { form.submit(); }, failure: function (o, resp) { - Ext.getCmp('import_process_bpmn').close(); + Ext.getCmp('importProcessWindow').close(); Ext.MessageBox.show({ title: '', msg: resp.catchMessage, From 2685c985d590fd40fbd1f7c8c212479533999867 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 23 Feb 2015 18:00:19 -0400 Subject: [PATCH 4/5] I deleted a validation --- workflow/engine/classes/class.derivation.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 895b06998..d7ea9c5f3 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -207,7 +207,6 @@ class Derivation $flagContinue = false; } } - if ($arrayRouteData["ROU_TYPE"] == "EVALUATE" && count($arrayNextTask) > 0) { $flagContinue = false; } @@ -216,9 +215,6 @@ class Derivation $arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData); } } - if($flagDefault && !$flagContinue){ - $arrayNextTask = array(); - } if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) { $arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault); } From fd72aa16be421058390403829a5dfd3496f40282 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 24 Feb 2015 13:17:18 -0400 Subject: [PATCH 5/5] Updating .po and .sql files for Beta5.1 --- .../translations/english/processmaker.en.po | 36 +++++++++---------- workflow/engine/data/mssql/insert.sql | 18 +++++----- workflow/engine/data/mysql/insert.sql | 20 +++++------ 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 90e0a22e0..ec55ccae0 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ProcessMaker 3.0\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2015-02-21 11:15:01\n" +"PO-Revision-Date: 2015-02-24 12:12:47\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -3880,8 +3880,8 @@ msgstr "Saved" # TRANSLATION # LABEL/ID_ASSIGN_RULES #: LABEL/ID_ASSIGN_RULES -msgid "[LABEL/ID_ASSIGN_RULES] Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn't be used with subprocesses" -msgstr "Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn't be used with subprocesses" +msgid "Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn't be used with sub-processes" +msgstr "Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn't be used with sub-processes" # TRANSLATION # LABEL/ID_SELECT_OPTION_TABLE @@ -3898,8 +3898,8 @@ msgstr "Please select a table to export." # TRANSLATION # LABEL/ID_TASK_WAS_ASSIGNED_TO_USER #: LABEL/ID_TASK_WAS_ASSIGNED_TO_USER -msgid "Manual assignment shouldn't be used with subprocesses.
The task \"{0}\" from case {1} was assigned to user {2} ( {3} {4} )" -msgstr "Manual assignment shouldn't be used with subprocesses.
The task \"{0}\" from case {1} was assigned to user {2} ( {3} {4} )" +msgid "Manual assignment shouldn't be used with sub-processes.
The task \"{0}\" from case {1} was assigned to user {2} ( {3} {4} )" +msgstr "Manual assignment shouldn't be used with sub-processes.
The task \"{0}\" from case {1} was assigned to user {2} ( {3} {4} )" # TRANSLATION # LABEL/ID_USER_ONVACATION @@ -8320,8 +8320,8 @@ msgstr "Sub-Process" # TRANSLATION # LABEL/ID_SUBPROCESS_NAME #: LABEL/ID_SUBPROCESS_NAME -msgid "SubProcess name" -msgstr "SubProcess name" +msgid "Sub-Process name" +msgstr "Sub-Process name" # TRANSLATION # LABEL/ID_VARIABLES_OUT @@ -13432,8 +13432,8 @@ msgstr "Check Workspace Configuration" # TRANSLATION # LABEL/ID_DELETE_DATABASES #: LABEL/ID_DELETE_DATABASES -msgid "Delete Databases if exists" -msgstr "Delete Databases if exists" +msgid "Delete database if it exists" +msgstr "Delete database if it exists" # TRANSLATION # LABEL/ID_RP_DATABASE_NAME @@ -13456,8 +13456,8 @@ msgstr "Workflow Database Name" # TRANSLATION # LABEL/ID_CHANGE_DATABASE_NAME #: LABEL/ID_CHANGE_DATABASE_NAME -msgid "Change Database names" -msgstr "Change Database names" +msgid "Change database name" +msgstr "Change database name" # TRANSLATION # LABEL/ID_ADMIN_USERNAME @@ -13570,8 +13570,8 @@ msgstr "File Permissions" # TRANSLATION # LABEL/ID_DATA_CORRECT #: LABEL/ID_DATA_CORRECT -msgid "The data is correct." -msgstr "The data is correct." +msgid "The configuration is correct." +msgstr "The configuration is correct." # TRANSLATION # LABEL/ID_EXIST @@ -17962,8 +17962,8 @@ msgstr "Add Task" # TRANSLATION # LABEL/ID_ADD_SUB_PROCESS #: LABEL/ID_ADD_SUB_PROCESS -msgid "Add Sub Process" -msgstr "Add Sub Process" +msgid "[LABEL/ID_ADD_SUB_PROCESS] Add Sub-Process" +msgstr "Add Sub-Process" # TRANSLATION # LABEL/ID_SAVE_TASK_POSITION @@ -18106,8 +18106,8 @@ msgstr "Delete Routes" # TRANSLATION # LABEL/ID_DELETE_SUB_PROCESS #: LABEL/ID_DELETE_SUB_PROCESS -msgid "Delete Sub Process" -msgstr "Delete Sub Process" +msgid "[LABEL/ID_DELETE_SUB_PROCESS] Delete Sub-Process" +msgstr "Delete Sub-Process" # TRANSLATION # LABEL/ID_IMPORT_ALREADY_EXISTS_BPMN @@ -30440,7 +30440,7 @@ msgstr "Sub-Process" # processes/processes_subProcess.xml?SPROCESS_NAME # processes/processes_subProcess.xml #: text - SPROCESS_NAME -msgid "[processes/processes_subProcess.xml?SPROCESS_NAME] SubProcess name" +msgid "SubProcess name" msgstr "SubProcess name" # processes/processes_subProcess.xml?TASKS diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 18865b476..86dba7246 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -2694,13 +2694,13 @@ SELECT 'LABEL','ID_WARNING','en','WARNING','2014-01-15' UNION ALL SELECT 'LABEL','ID_SAVED','en','Saved','2014-01-15' UNION ALL -SELECT 'LABEL','ID_ASSIGN_RULES','en','Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn''t be used with subprocesses','2014-01-15' +SELECT 'LABEL','ID_ASSIGN_RULES','en','Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn''t be used with sub-processes','2015-02-24' UNION ALL SELECT 'LABEL','ID_SELECT_OPTION_TABLE','en','Select an option to export the schema or data from the selected table(s).','2014-10-21' UNION ALL SELECT 'LABEL','ID_SELECT_TABLE','en','Please select a table to export.','2014-01-15' UNION ALL -SELECT 'LABEL','ID_TASK_WAS_ASSIGNED_TO_USER','en','Manual assignment shouldn''t be used with subprocesses.
The task "{0}" from case {1} was assigned to user {2} ( {3} {4} )','2014-01-15' +SELECT 'LABEL','ID_TASK_WAS_ASSIGNED_TO_USER','en','Manual assignment shouldn''t be used with sub-processes.
The task "{0}" from case {1} was assigned to user {2} ( {3} {4} )','2015-02-24' UNION ALL SELECT 'LABEL','ID_USER_ONVACATION','en','User on vacation! Contact to your System Administrator if you want to login. please','2014-01-15' UNION ALL @@ -4192,7 +4192,7 @@ SELECT 'LABEL','ID_TARGET','en','Target','2014-01-15' UNION ALL SELECT 'LABEL','ID_SUBPROCESS','en','Sub-Process','2014-01-15' UNION ALL -SELECT 'LABEL','ID_SUBPROCESS_NAME','en','SubProcess name','2014-01-15' +SELECT 'LABEL','ID_SUBPROCESS_NAME','en','Sub-Process name','2015-02-24' UNION ALL SELECT 'LABEL','ID_VARIABLES_OUT','en','Variables Out','2014-01-15' UNION ALL @@ -5842,7 +5842,7 @@ SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP6','en','xxx','2014 UNION ALL SELECT 'LABEL','ID_SIZE_VERY_LARGE_PERMITTED','en','The file is too large . Please upload a smaller file.','2014-10-08' UNION ALL -SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login.','2014-09-02' +SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login.','2015-02-23' UNION ALL SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_2','en','If you are installing ProcessMaker on a remote web server, you will need to get this information from your Database Server.','2014-01-15' UNION ALL @@ -5916,7 +5916,7 @@ SELECT 'LABEL','ID_NON_WRITABLE_FILES','en','Non-writable Files','2014-01-15' UNION ALL SELECT 'LABEL','ID_CHECK_WORKSPACE_CONFIGURATION','en','Check Workspace Configuration','2014-01-15' UNION ALL -SELECT 'LABEL','ID_DELETE_DATABASES','en','Delete Databases if exists','2014-01-15' +SELECT 'LABEL','ID_DELETE_DATABASES','en','Delete database if it exists','2015-02-23' UNION ALL SELECT 'LABEL','ID_RP_DATABASE_NAME','en','Report Database Name','2014-01-15' UNION ALL @@ -5926,7 +5926,7 @@ SELECT 'LABEL','ID_WF_DATABASE_NAME','en','Workflow Database Name','2014-01-15' ; INSERT INTO [TRANSLATION] ([TRN_CATEGORY],[TRN_ID],[TRN_LANG],[TRN_VALUE],[TRN_UPDATE_DATE]) -SELECT 'LABEL','ID_CHANGE_DATABASE_NAME','en','Change Database names','2014-01-15' +SELECT 'LABEL','ID_CHANGE_DATABASE_NAME','en','Change database name','2015-02-23' UNION ALL SELECT 'LABEL','ID_ADMIN_USERNAME','en','Admin Username','2014-01-15' UNION ALL @@ -5964,7 +5964,7 @@ SELECT 'LABEL','ID_PREINSTALLATION','en','Pre-installation check','2014-01-15' UNION ALL SELECT 'LABEL','ID_DIRECTORY_FILE_PERMISSION','en','File Permissions','2014-10-21' UNION ALL -SELECT 'LABEL','ID_DATA_CORRECT','en','The data is correct.','2014-01-15' +SELECT 'LABEL','ID_DATA_CORRECT','en','The configuration is correct.','2015-02-23' UNION ALL SELECT 'LABEL','ID_EXIST','en','Exist','2014-01-15' UNION ALL @@ -7446,7 +7446,7 @@ SELECT 'LABEL','ID_REMOVE_USER','en','Remove User','2015-02-20' UNION ALL SELECT 'LABEL','ID_ADD_TASK','en','Add Task','2015-02-20' UNION ALL -SELECT 'LABEL','ID_ADD_SUB_PROCESS','en','Add Sub Process','2015-02-20' +SELECT 'LABEL','ID_ADD_SUB_PROCESS','en','Add Sub-Process','2015-02-24' UNION ALL SELECT 'LABEL','ID_SAVE_TASK_POSITION','en','Save Task Position','2015-02-20' UNION ALL @@ -7494,7 +7494,7 @@ SELECT 'LABEL','ID_DELETE_TASK','en','Delete Task','2015-02-20' UNION ALL SELECT 'LABEL','ID_DELETE_ROUTES','en','Delete Routes','2015-02-20' UNION ALL -SELECT 'LABEL','ID_DELETE_SUB_PROCESS','en','Delete Sub Process','2015-02-20' +SELECT 'LABEL','ID_DELETE_SUB_PROCESS','en','Delete Sub-Process','2015-02-24' UNION ALL SELECT 'LABEL','ID_IMPORT_ALREADY_EXISTS_BPMN','en','A process with the same name already exists!. Do you want to overwrite the existing process or you want to create a new process?.','2015-02-20' UNION ALL diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index fd70d295d..b13cfd05a 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -2050,10 +2050,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_FIELD_INVALID','en','Field Invalid','2014-01-15') , ( 'LABEL','ID_WARNING','en','WARNING','2014-01-15') , ( 'LABEL','ID_SAVED','en','Saved','2014-01-15') , -( 'LABEL','ID_ASSIGN_RULES','en','Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn''t be used with subprocesses','2014-01-15') , +( 'LABEL','ID_ASSIGN_RULES','en','Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn''t be used with sub-processes','2015-02-24') , ( 'LABEL','ID_SELECT_OPTION_TABLE','en','Select an option to export the schema or data from the selected table(s).','2014-10-21') , ( 'LABEL','ID_SELECT_TABLE','en','Please select a table to export.','2014-01-15') , -( 'LABEL','ID_TASK_WAS_ASSIGNED_TO_USER','en','Manual assignment shouldn''t be used with subprocesses.
The task "{0}" from case {1} was assigned to user {2} ( {3} {4} )','2014-01-15') , +( 'LABEL','ID_TASK_WAS_ASSIGNED_TO_USER','en','Manual assignment shouldn''t be used with sub-processes.
The task "{0}" from case {1} was assigned to user {2} ( {3} {4} )','2015-02-24') , ( 'LABEL','ID_USER_ONVACATION','en','User on vacation! Contact to your System Administrator if you want to login. please','2014-01-15') , ( 'LABEL','PASSWORD_HISTORY','en','Password history','2014-01-15') , ( 'JAVASCRIPT','ID_EMAIL_REQUIRED','en','Mail To is required, or uncheck the Send a Test Mail option','2014-01-15') , @@ -2808,7 +2808,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_ORIGIN','en','Origin','2014-01-15') , ( 'LABEL','ID_TARGET','en','Target','2014-01-15') , ( 'LABEL','ID_SUBPROCESS','en','Sub-Process','2014-01-15') , -( 'LABEL','ID_SUBPROCESS_NAME','en','SubProcess name','2014-01-15') , +( 'LABEL','ID_SUBPROCESS_NAME','en','Sub-Process name','2015-02-24') , ( 'LABEL','ID_VARIABLES_OUT','en','Variables Out','2014-01-15') , ( 'LABEL','ID_VARIABLES_IN','en','Variables In','2014-01-15') , ( 'LABEL','ID_SUBPROCESS_SAVE','en','Sub-process properties have been saved successfully.','2015-01-16') , @@ -3643,7 +3643,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_LOGIN_WITH_FACEBOOK','en','Login with Facebook!!','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP6','en','xxx','2014-01-15') , ( 'LABEL','ID_SIZE_VERY_LARGE_PERMITTED','en','The file is too large . Please upload a smaller file.','2014-10-08') , -( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login.','2014-09-02') , +( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login.','2015-02-23') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_2','en','If you are installing ProcessMaker on a remote web server, you will need to get this information from your Database Server.','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_1','en','ProcessMaker stores all of its data in a database. This screen gives the installation program the information needed to create this database.','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP3_2','en','If you see \"unwritable\", change the permissions on the file or directory to allow ProcessMaker to write to it.','2015-01-16') , @@ -3680,13 +3680,13 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_FINISHING','en','Finishing...','2014-01-15') , ( 'LABEL','ID_NON_WRITABLE_FILES','en','Non-writable Files','2014-01-15') , ( 'LABEL','ID_CHECK_WORKSPACE_CONFIGURATION','en','Check Workspace Configuration','2014-01-15') , -( 'LABEL','ID_DELETE_DATABASES','en','Delete Databases if exists','2014-01-15') , +( 'LABEL','ID_DELETE_DATABASES','en','Delete database if it exists','2015-02-23') , ( 'LABEL','ID_RP_DATABASE_NAME','en','Report Database Name','2014-01-15') , ( 'LABEL','ID_RB_DATABASE_NAME','en','Rbac Database Name','2014-01-15') , ( 'LABEL','ID_WF_DATABASE_NAME','en','Workflow Database Name','2014-01-15') ; INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES -( 'LABEL','ID_CHANGE_DATABASE_NAME','en','Change Database names','2014-01-15') , +( 'LABEL','ID_CHANGE_DATABASE_NAME','en','Change database name','2015-02-23') , ( 'LABEL','ID_ADMIN_USERNAME','en','Admin Username','2014-01-15') , ( 'LABEL','ID_ADMIN_PASSWORD','en','Confirm Admin Password','2014-01-15') , ( 'LABEL','ID_WORKSPACE_NAME','en','Workspace Name','2014-01-15') , @@ -3705,7 +3705,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_NOT_PASSED','en','Not Passed.','2014-01-15') , ( 'LABEL','ID_PREINSTALLATION','en','Pre-installation check','2014-01-15') , ( 'LABEL','ID_DIRECTORY_FILE_PERMISSION','en','File Permissions','2014-10-21') , -( 'LABEL','ID_DATA_CORRECT','en','The data is correct.','2014-01-15') , +( 'LABEL','ID_DATA_CORRECT','en','The configuration is correct.','2015-02-23') , ( 'LABEL','ID_EXIST','en','Exist','2014-01-15') , ( 'LABEL','ID_NO_EXIST','en','Does not exist','2015-01-16') , ( 'LABEL','ID_REPORT_DATABASE_NAME','en','Please enter the Report Database Name.','2014-01-15') , @@ -4455,7 +4455,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_DELETE_CASE_SCHEDULER','en','Delete Case Scheduler','2015-02-20') , ( 'LABEL','ID_REMOVE_USER','en','Remove User','2015-02-20') , ( 'LABEL','ID_ADD_TASK','en','Add Task','2015-02-20') , -( 'LABEL','ID_ADD_SUB_PROCESS','en','Add Sub Process','2015-02-20') , +( 'LABEL','ID_ADD_SUB_PROCESS','en','Add Sub-Process','2015-02-24') , ( 'LABEL','ID_SAVE_TASK_POSITION','en','Save Task Position','2015-02-20') , ( 'LABEL','ID_CREATE_DATABASE_CONNECTION','en','Create New Database connection','2015-02-20') , ( 'LABEL','ID_SAVE_GUIDE_POSITION','en','Save Line Position','2015-02-20') , @@ -4479,7 +4479,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_OPTIONS_MENU_TASK','en','Options Menu Task','2015-02-20') , ( 'LABEL','ID_DELETE_TASK','en','Delete Task','2015-02-20') , ( 'LABEL','ID_DELETE_ROUTES','en','Delete Routes','2015-02-20') , -( 'LABEL','ID_DELETE_SUB_PROCESS','en','Delete Sub Process','2015-02-20') , +( 'LABEL','ID_DELETE_SUB_PROCESS','en','Delete Sub-Process','2015-02-24') , ( 'LABEL','ID_IMPORT_ALREADY_EXISTS_BPMN','en','A process with the same name already exists!. Do you want to overwrite the existing process or you want to create a new process?.','2015-02-20') , ( 'LABEL','ID_IMPORT_ALREADY_EXISTS_BPMN_NOTE','en','Note that your changes will be lost in your existing process if you overwrite it.','2015-02-20') , ( 'LABEL','ID_CREATE_NEW','en','Create new','2015-02-20') , @@ -59887,4 +59887,4 @@ INSERT INTO DASHLET_INSTANCE (DAS_INS_UID,DAS_UID,DAS_INS_OWNER_TYPE,DAS_INS_OWN ('00000000000000000000000000000004','00000000000000000000000000000004','EVERYBODY','','a:2:{s:13:"DAS_INS_TITLE";s:15:"PM Plugins News";s:7:"DAS_URL";s:71:"http://license.processmaker.com/syspmLicenseSrv/en/green/services/rssAP";}','2012-04-16 00:00:00','2012-04-16 00:00:00',1); INSERT INTO CONFIGURATION (CFG_UID,OBJ_UID,CFG_VALUE,PRO_UID,USR_UID,APP_UID) VALUES -('ENVIRONMENT_SETTINGS','','a:1:{s:18:"directoryStructure";i:2;}','','',''); +('ENVIRONMENT_SETTINGS','','a:1:{s:18:"directoryStructure";i:2;}','','',''); \ No newline at end of file