fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master' into BUG-10834

Browse Source
This commit is contained in:
Hector Cortez
2013-03-25 10:12:55 -04:00
parent 27b72b2c7f 1741af5292
commit 3186f89555
6 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

2
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -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();
}

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

@@ -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'

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

@@ -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') ,

1
workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
View File

@@ -299,6 +299,7 @@ var insertFormVar = function(sFieldName, sValue) {
else {
if (document.selection) {
oAux.focus();
oAux.value = '';
document.selection.createRange().text = sValue;
}
}

2
workflow/engine/xmlform/users/users_EditLDAP.xml
View File

@@ -14,7 +14,7 @@
<en>Photo</en>
</USR_PHOTO>
<USR_RESUME type="file" group="1">
<en>Résumé</en>
<en>Resume</en>
</USR_RESUME>
<MAX_FILES_SIZE type="edit" mode="view">
<en>Max upload files size in bytes</en>