From 01462ecade6e6887052656b58ec5028925cefc00 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 22 Mar 2013 15:20:41 -0400 Subject: [PATCH 1/3] BUG 10953 IMPROVEMENT --- workflow/engine/controllers/pmTablesProxy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index 0a6ccf585..fa1a8073b 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -317,7 +317,7 @@ class pmTablesProxy extends HttpProxyController if ($isReportTable && $alterTable) { // the table was create successfully but we're catching problems while populating table try { - $oAdditionalTables->populateReportTable( $data['REP_TAB_NAME'], $pmTable->getDataSource(), $data['REP_TAB_TYPE'], $data['PRO_UID'], $data['REP_TAB_GRID'], $addTabData['ADD_TAB_UID'] ); + $oAdditionalTables->populateReportTable( $data['REP_TAB_NAME'], $pmTable->getDataSource(), $data['REP_TAB_TYPE'], $data['PRO_UID'], $data['REP_TAB_GRID'], $addTabUid ); } catch (Exception $e) { $result->message = $result->msg = $e->getMessage(); } From 179c371e930f9fa89a1d98b6363392903421015f Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 22 Mar 2013 16:25:30 -0400 Subject: [PATCH 2/3] BUG 10701 I added validation for IE SOLVED I added validation for IE --- workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml b/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml index 1ccfd1700..2d7ad6a0d 100755 --- a/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml +++ b/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml @@ -299,6 +299,7 @@ var insertFormVar = function(sFieldName, sValue) { else { if (document.selection) { oAux.focus(); + oAux.value = ''; document.selection.createRange().text = sValue; } } From 147484098c9d86b7fa3b7072fd1f916755243406 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 22 Mar 2013 16:54:25 -0400 Subject: [PATCH 3/3] =?UTF-8?q?Change=20label=20R=C3=A9sum=C3=A9=20toto=20?= =?UTF-8?q?Resume?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/translations/english/processmaker.en.po | 10 ++-------- workflow/engine/data/mssql/insert.sql | 2 -- workflow/engine/data/mysql/insert.sql | 1 - workflow/engine/xmlform/users/users_EditLDAP.xml | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index c9ce60f79..df42de21c 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -691,12 +691,6 @@ msgstr "You are in the first step!" msgid "Edit process" msgstr "Edit process" -# TRANSLATION -# JAVASCRIPT/curriculum -#: JAVASCRIPT/curriculum -msgid "Resume" -msgstr "Resume" - # TRANSLATION # JAVASCRIPT/ID_OPEN_SEARCH #: JAVASCRIPT/ID_OPEN_SEARCH @@ -32426,8 +32420,8 @@ msgstr "Photo" # users/users_EditLDAP.xml?USR_RESUME # users/users_EditLDAP.xml #: file - USR_RESUME -msgid "[users/users_EditLDAP.xml?USR_RESUME] Résumé" -msgstr "Résumé" +msgid "[users/users_EditLDAP.xml?USR_RESUME] Resume" +msgstr "Resume" # users/users_EditLDAP.xml?MAX_FILES_SIZE # users/users_EditLDAP.xml diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 4a658f721..312583696 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -1599,8 +1599,6 @@ SELECT 'LABEL','ID_YOU_ARE_FIRST_STEP','en','You are in the first step!','2012-0 UNION ALL SELECT 'JAVASCRIPT','EDIT_PROCESS','en','Edit process','2012-06-01' UNION ALL -SELECT 'JAVASCRIPT','curriculum','en','Resume','2012-06-01' - UNION ALL SELECT 'JAVASCRIPT','ID_OPEN_SEARCH','en','Advanced Search','2012-06-01' UNION ALL SELECT 'JAVASCRIPT','ID_CLOSE_SEARCH','en','Close Search','2012-06-01' diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index fa8eeff82..d61068d61 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -1486,7 +1486,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CANCEL_CASE','en','Cancel Case','2012-06-01') , ( 'LABEL','ID_YOU_ARE_FIRST_STEP','en','You are in the first step!','2012-06-01') , ( 'JAVASCRIPT','EDIT_PROCESS','en','Edit process','2012-06-01') , -( 'JAVASCRIPT','curriculum','en','Resume','2012-06-01') , ( 'JAVASCRIPT','ID_OPEN_SEARCH','en','Advanced Search','2012-06-01') , ( 'JAVASCRIPT','ID_CLOSE_SEARCH','en','Close Search','2012-06-01') , ( 'JAVASCRIPT','ID_URL_OF_LINK','en','Enter the URL for the link','2012-06-01') , diff --git a/workflow/engine/xmlform/users/users_EditLDAP.xml b/workflow/engine/xmlform/users/users_EditLDAP.xml index 75d36fbd7..4cb3dff18 100644 --- a/workflow/engine/xmlform/users/users_EditLDAP.xml +++ b/workflow/engine/xmlform/users/users_EditLDAP.xml @@ -14,7 +14,7 @@ Photo - Résumé + Resume Max upload files size in bytes