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

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

Browse Source
This commit is contained in:
Marco Antonio Nina
2012-06-06 11:32:02 -04:00
parent 8c684b9228 0f2891e762
commit c970e07048
10 changed files with 4263 additions and 4193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/class.wsBase.php
View File

@@ -651,19 +651,21 @@ class wsBase
$fileTemplate = $pathEmail . $sTemplate;
G::mk_dir( $pathEmail, 0777,true);
if ( ! file_exists ( $fileTemplate ) ) {
if (!file_exists($fileTemplate)) {
$data['FILE_TEMPLATE'] = $fileTemplate;
$result = new wsResponse (28, G::LoadTranslation('ID_TEMPLATE_FILE_NOT_EXIST', SYS_LANG, $data) );
$result = new wsResponse(28, G::LoadTranslation('ID_TEMPLATE_FILE_NOT_EXIST', SYS_LANG, $data));
return $result;
}
if ( $appFields == null ) {
$Fields = $oldFields['APP_DATA'];
if ($appFields == null) {
$Fields = $oldFields['APP_DATA'];
}
else {
$Fields = $appFields;
$Fields = array_merge($oldFields['APP_DATA'], $appFields);
}
$templateContents = file_get_contents ( $fileTemplate );
$templateContents = file_get_contents($fileTemplate);
//$sContent = G::unhtmlentities($sContent);
$iAux = 0;

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

@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker (Branch 2.0-testing) dummy-119-g6a8c61e\n"
"Project-Id-Version: ProcessMaker (Branch 2.0-experimental) dummy-126-g6fb2f2d\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2012-05-16 15:56:38\n"
"PO-Revision-Date: 2012-05-31 19:14:21\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -3856,8 +3856,8 @@ msgstr "Field \"table\" is required"
# TRANSLATION
# JAVASCRIPT/ID_ASSIGN_RULES
#: JAVASCRIPT/ID_ASSIGN_RULES
msgid "Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn't be used with subprocesses"
msgstr "Error: There is a problem with next tasks of this process, one of them have 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 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"
# TRANSLATION
# LABEL/ID_FIELD_INVALID
@@ -3880,8 +3880,8 @@ msgstr "Saved"
# TRANSLATION
# LABEL/ID_ASSIGN_RULES
#: LABEL/ID_ASSIGN_RULES
msgid "Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn't be used with subprocesses"
msgstr "Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn't be used with subprocesses"
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"
# TRANSLATION
# LABEL/ID_SELECT_OPTION_TABLE
@@ -5572,8 +5572,8 @@ msgstr "Do you want to delete all selected processes?"
# TRANSLATION
# LABEL/ID_PROCESS_CANT_DELETE
#: LABEL/ID_PROCESS_CANT_DELETE
msgid "You can't delete the process \"{0}\" because has {1} cases."
msgstr "You can't delete the process \"{0}\" because has {1} cases."
msgid "You can't delete the process \"{0}\" because it has {1} cases."
msgstr "You can't delete the process \"{0}\" because it has {1} cases."
# TRANSLATION
# LABEL/ID_FILE
@@ -5812,8 +5812,8 @@ msgstr "The root password has been updated successfully!"
# TRANSLATION
# LABEL/ID_MESSAGE_ROOT_CHANGE_FAILURE
#: LABEL/ID_MESSAGE_ROOT_CHANGE_FAILURE
msgid "The root password has can't be updated !"
msgstr "The root password has can't be updated !"
msgid "The root password can't be updated!"
msgstr "The root password can't be updated!"
# TRANSLATION
# LABEL/ID_LAN_TRANSLATOR
@@ -13498,7 +13498,7 @@ msgstr "Yes"
# authSources/ldapEdit.xml?AUTH_SOURCE_SEARCH_USER
# authSources/ldapEdit.xml
#: text - AUTH_SOURCE_SEARCH_USER
msgid "Search User"
msgid "[authSources/ldapEdit.xml?AUTH_SOURCE_SEARCH_USER] Search User"
msgstr "Search User"
# authSources/ldapEdit.xml?AUTH_SOURCE_PASSWORD
@@ -15543,7 +15543,7 @@ msgstr "DATE"
# cases/cases_MessagesView.xml?APP_MSG_BODY
# cases/cases_MessagesView.xml
#: html - APP_MSG_BODY
#: text - APP_MSG_BODY
msgid "[cases/cases_MessagesView.xml?APP_MSG_BODY] "
msgstr ""
@@ -21539,6 +21539,42 @@ msgstr "Send Request"
msgid "[login/forgotPassword.xml?BCANCEL] Cancel"
msgstr "Cancel"
# login/login (copy).xml?TITLE
# login/login (copy).xml
#: title - TITLE
msgid "[login/login (copy).xml?TITLE] Login"
msgstr "Login"
# login/login (copy).xml?USR_USERNAME
# login/login (copy).xml
#: text - USR_USERNAME
msgid "[login/login (copy).xml?USR_USERNAME] User"
msgstr "User"
# login/login (copy).xml?USR_PASSWORD
# login/login (copy).xml
#: password - USR_PASSWORD
msgid "[login/login (copy).xml?USR_PASSWORD] Password"
msgstr "Password"
# login/login (copy).xml?USER_LANG
# login/login (copy).xml
#: dropdown - USER_LANG
msgid "[login/login (copy).xml?USER_LANG] Language"
msgstr "Language"
# login/login (copy).xml?BSUBMIT
# login/login (copy).xml
#: submit - BSUBMIT
msgid "[login/login (copy).xml?BSUBMIT] Login"
msgstr "Login"
# login/login (copy).xml?FORGOT_PASWORD_LINK
# login/login (copy).xml
#: link - FORGOT_PASWORD_LINK
msgid "[login/login (copy).xml?FORGOT_PASWORD_LINK] Forgot Password"
msgstr "Forgot Password"
# login/login.xml?TITLE
# login/login.xml
#: title - TITLE

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

20
workflow/engine/js/processmap/core/processmap.js
View File

@@ -919,13 +919,15 @@ var processmap=function(){
if(deri.type===5 || deri.type===8)
{
var toTask = this.data.db.task[this.tools.getIndexOfUid(deri.to[i].task)];
toTask.object.inJoin = toTask.object.inJoin-1;
if(toTask.object.inJoin===0)
{
this.parent.dom.setStyle(toTask.object.elements.init,{
backgroundPosition:"0 0",
background:""
});
if (typeof(toTask) != 'undefined') {
toTask.object.inJoin = toTask.object.inJoin-1;
if(toTask.object.inJoin===0)
{
this.parent.dom.setStyle(toTask.object.elements.init,{
backgroundPosition:"0 0",
background:""
});
}
}
}
}
@@ -2207,7 +2209,7 @@ var processmap=function(){
iHeight = 350;
break;
case 4:
iWidth = 500;
iWidth = 600;
iHeight = 350;
break;
case 5:
@@ -2227,7 +2229,7 @@ var processmap=function(){
position:{x:50,y:50,center:true},
title :G_STRINGS.ID_PROCESSMAP_WORKFLOW_PATTERNS+": "+task.label,
theme :this.options.theme,
control :{close:true,resize:false},
control :{close:true,resize:true},
fx :{modal:true}
};
panel.make();

10
workflow/engine/skinEngine/skinEngine.php
View File

@@ -162,10 +162,10 @@ class SkinEngine
switch ($e->getCode()) {
case SE_LAYOUT_NOT_FOUND:
$data['exception_type'] = 'Skin Engine Exception';
$data['exception_title'] = 'Layout not Found';
$data['exception_message'] = 'You\'re trying to get a resource from a incorrent skin, please verify you url.';
$data['exception_list'] = array();
$data['exception_type'] = G::LoadTranslation('ID_SKIN_EXCEPTION');
$data['exception_title'] = G::LoadTranslation('ID_SKIN_LAYOUT_NOT_FOUND');
$data['exception_message'] = G::LoadTranslation('ID_SKIN_INCORRECT_VERIFY_URL');
$data['exception_list'] = array();
if (substr($this->mainSkin, 0, 2) != 'ux') {
$url = '../login/login';
}
@@ -175,7 +175,7 @@ class SkinEngine
$link = '<a href="'.$url.'">Try Now</a>';
$data['exception_notes'][] = ' The System can try redirect to correct url. ' . $link;
$data['exception_notes'][] = G::LoadTranslation('ID_REDIRECT_URL'). $link;
G::renderTemplate(PATH_TPL . 'exception', $data);
break;

6
workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
View File

@@ -38,7 +38,11 @@
</td>
<td height="12" valign="middle" align="right" valign="top">
<a href="#" id="options-tool" class="options-tool">
{$userfullname}<br />
{$userfullname}
<span>
<img src="/images/classic/roll.static.gif" width="10px" headerRightSection="10px"/>
</span>
<br />
<span style="font-size:9px">{$rolename}</span>
</a>
</td>

40
workflow/engine/templates/cases/casesStartCase.js
View File

@@ -122,13 +122,19 @@ Ext.onReady(function() {
name: 'processName',
allowBlank:false,
value: '',
labelStyle: 'font-weight:bold;',
labelStyle : 'font-size:11px;',
style : {
fontSize:'11px'
},
id:"processName"
},
{
xtype: 'compositefield',
fieldLabel: TRANSLATIONS.ID_TASK,
labelStyle: 'font-weight:bold;',
labelStyle : 'font-size:11px;',
style : {
fontSize:'11px'
},
items: [
{
xtype : 'button',
@@ -160,21 +166,30 @@ Ext.onReady(function() {
name: 'processDescription',
value: '',
readOnly: true,
labelStyle: 'font-weight:bold;',
labelStyle : 'font-size:11px;',
style : {
fontSize:'11px'
},
id:"processDescription"
},{
fieldLabel: TRANSLATIONS.ID_CATEGORY,
name: 'processCategory',
value: '',
readOnly: true,
labelStyle: 'font-weight:bold;',
labelStyle : 'font-size:11px;',
style : {
fontSize:'11px'
},
id:"processCategory"
},
{
xtype: 'grid',
fieldLabel: ' ',
labelSeparator : '',
labelStyle: 'font-color:white;',
labelStyle : 'font-size:11px;',
style : {
fontSize:'11px'
},
ds: processNumbers,
cm: new Ext.grid.ColumnModel([
{id:'inbox',header: TRANSLATIONS.ID_INBOX, width:70, sortable: false, locked:true, dataIndex: 'CASES_COUNT_TO_DO'},
@@ -190,7 +205,10 @@ Ext.onReady(function() {
{
fieldLabel: TRANSLATIONS.ID_CALENDAR,
name: 'calendarName',
labelStyle: 'font-weight:bold;',
labelStyle : 'font-size:11px;',
style : {
fontSize:'11px'
},
id:"calendarName"
},
{
@@ -200,7 +218,10 @@ Ext.onReady(function() {
disabled: true,
readOnly: true,
disabledClass:"",
labelStyle: 'font-weight:bold',
labelStyle : 'font-size:11px;',
style : {
fontSize:'11px'
},
id:"calendarWorkDays",
columns: 7,
items: [
@@ -217,7 +238,10 @@ Ext.onReady(function() {
xtype:'checkbox',
fieldLabel: TRANSLATIONS.ID_DEBUG_MODE,
name: 'processDebug',
labelStyle: 'font-weight:bold;',
labelStyle : 'font-size:11px;',
style : {
fontSize:'11px'
},
disabled: true,
readOnly: true,
id:"processDebug",

3
workflow/engine/xmlform/patterns/patterns_ParallelJoin.xml
View File

@@ -39,6 +39,7 @@ leimnud.event.add(getField('ROU_NEXT_TASK'), 'change', modified);
//leimnud.event.add(getField('ROU_TO_LAST_USER'), 'change', modified);
Pm.tmp.derivationsPanel.events.remove = function() {
if (bModified) {
Pm.tmp.derivationsPanel.inRemove = false;
Pm.tmp.derivationsPanel.cancelClose=true;
new leimnud.module.app.confirm().make({
label: G_STRINGS.ID_SAVE_DERIVATION_RULES_BEFORE_CLOSING,
@@ -46,7 +47,7 @@ Pm.tmp.derivationsPanel.events.remove = function() {
Pm.tmp.derivationsPanel.cancelClose=false;
bModified = false;
getField('SAVE').onclick();
}.extend(this),
},
cancel: function() {
Pm.tmp.derivationsPanel.cancelClose=false;
bModified = false;

3
workflow/engine/xmlform/patterns/patterns_Sequential.xml
View File

@@ -41,6 +41,7 @@ leimnud.event.add(getField('ROU_NEXT_TASK'), 'change', modified);
//leimnud.event.add(getField('ROU_TO_LAST_USER'), 'change', modified);
Pm.tmp.derivationsPanel.events.remove = function() {
if (bModified) {
Pm.tmp.derivationsPanel.inRemove = false;
Pm.tmp.derivationsPanel.cancelClose=true;
new leimnud.module.app.confirm().make({
label: G_STRINGS.ID_SAVE_DERIVATION_RULES_BEFORE_CLOSING,
@@ -48,7 +49,7 @@ Pm.tmp.derivationsPanel.events.remove = function() {
Pm.tmp.derivationsPanel.cancelClose=false;
bModified = false;
getField('SAVE').onclick();
}.extend(this),
},
cancel: function() {
Pm.tmp.derivationsPanel.cancelClose=false;
bModified = false;