fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/3.2.2 (pull request #6158)

Browse Source 
release/3.2.2

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-10-30 11:56:43 +00:00
parent 8b550cfca3 64554142a7
commit 7b332f8794
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/triggers/class.pmTrSharepoint.php Normal file
View File

@@ -0,0 +1,7 @@
<?php
/**
* Maintained for compatibility reasons.
* @deprecated 3.2.2, File maintained only for backward compatibility because it is used in plugins
*/

12
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -1501,6 +1501,12 @@ msgstr "You cannot delete the default language"
msgid "Please select a .po file" msgid "Please select a .po file"
msgstr "Please select a .po file" msgstr "Please select a .po file"
# TRANSLATION
# LABEL/ID_THE_REASON_REASSIGN_USER_EMPTY
#: LABEL/ID_THE_REASON_REASSIGN_USER_EMPTY
msgid "Please complete the reassign reason."
msgstr "Please complete the reassign reason."
# TRANSLATION # TRANSLATION
# LABEL/ID_EMAIL # LABEL/ID_EMAIL
#: LABEL/ID_EMAIL #: LABEL/ID_EMAIL
@@ -3007,12 +3013,6 @@ msgstr "Process"
msgid "Reassign Cases" msgid "Reassign Cases"
msgstr "Reassign Cases" msgstr "Reassign Cases"
# TRANSLATION
# LABEL/ID_THE_REASON_REASSIGN_USER_EMPTY
#: LABEL/ID_THE_REASON_REASSIGN_USER_EMPTY
msgid "Please complete the reassign reason."
msgstr "Please complete the reassign reason."
# TRANSLATION # TRANSLATION
# LABEL/ID_ALERT_MESSAGE # LABEL/ID_ALERT_MESSAGE
#: LABEL/ID_ALERT_MESSAGE #: LABEL/ID_ALERT_MESSAGE

2
workflow/engine/data/mssql/insert.sql
View File

@@ -2065,7 +2065,7 @@ SELECT 'LABEL','ID_REASON','en','Reason','2016-10-20'
UNION ALL UNION ALL
SELECT 'LABEL','ID_NOTIFY','en','Notify','2016-10-20' SELECT 'LABEL','ID_NOTIFY','en','Notify','2016-10-20'
UNION ALL UNION ALL
SELECT 'JAVASCRIPT','ID_THE_REASON_REASSIGN_USER_EMPTY','en','Please complete the reassign reason.','2016-10-20' SELECT 'LABEL','ID_THE_REASON_REASSIGN_USER_EMPTY','en','Please complete the reassign reason.','2016-10-20'
UNION ALL UNION ALL
SELECT 'LABEL','ID_PRIORITY_VH','en','VERY HIGH','2014-01-15' SELECT 'LABEL','ID_PRIORITY_VH','en','VERY HIGH','2014-01-15'
UNION ALL UNION ALL

2
workflow/engine/data/mysql/insert.sql
View File

@@ -1758,7 +1758,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_REASSIGN','en','Reassign','2014-01-15') , ( 'LABEL','ID_REASSIGN','en','Reassign','2014-01-15') ,
( 'LABEL','ID_REASON','en','Reason','2016-10-20') , ( 'LABEL','ID_REASON','en','Reason','2016-10-20') ,
( 'LABEL','ID_NOTIFY','en','Notify','2016-10-20') , ( 'LABEL','ID_NOTIFY','en','Notify','2016-10-20') ,
( 'JAVASCRIPT','ID_THE_REASON_REASSIGN_USER_EMPTY','en','Please complete the reassign reason.','2016-10-20') , ( 'LABEL','ID_THE_REASON_REASSIGN_USER_EMPTY','en','Please complete the reassign reason.','2016-10-20') ,
( 'LABEL','ID_PRIORITY_VH','en','VERY HIGH','2014-01-15') , ( 'LABEL','ID_PRIORITY_VH','en','VERY HIGH','2014-01-15') ,
( 'LABEL','ID_GROUPS','en','Groups','2014-01-15') , ( 'LABEL','ID_GROUPS','en','Groups','2014-01-15') ,
( 'LABEL','ID_CONFIRM_DELETE_CASE','en','Are you sure you want to delete this case?','2014-01-15') , ( 'LABEL','ID_CONFIRM_DELETE_CASE','en','Are you sure you want to delete this case?','2014-01-15') ,

2
workflow/engine/templates/cases/casesList.js
View File

@@ -1516,7 +1516,7 @@ Ext.onReady ( function() {
if( rowSelected ) { if( rowSelected ) {
if (Ext.getCmp('idTextareaReasonCasesList').getValue() === '') { if (Ext.getCmp('idTextareaReasonCasesList').getValue() === '') {
Ext.Msg.alert(_('ID_ALERT'), _('ID_CAN_NOT_BE_EMPTY', _('ID_REASON_REASSIGN'))); Ext.Msg.alert(_('ID_ALERT'), _('ID_THE_REASON_REASSIGN_USER_EMPTY'));
return; return;
} }
PMExt.confirm(_('ID_CONFIRM'), _('ID_REASSIGN_CONFIRM'), function(){ PMExt.confirm(_('ID_CONFIRM'), _('ID_REASSIGN_CONFIRM'), function(){