fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/develop' into bugfix/HOR-3150

Browse Source
This commit is contained in:
hjonathan
2017-05-23 09:50:46 -04:00
parent 1d4f971a60 b7043b76d5
commit 1e1312bcea
3 changed files with 35 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -3,7 +3,7 @@ node {
/** /**
* Branch should be in gitflow format. If not, then we'll abort. * Branch should be in gitflow format. If not, then we'll abort.
*/ */
if(!env.BRANCH_NAME.matches(/(feature|hotfix|bugfix|release)\/.+/) && !env.BRANCH_NAME.matches(/^PR-.*$/)) { if(!env.BRANCH_NAME.matches(/(feature|hotfix|bugfix|release|master|develop)\/.+/) && !env.BRANCH_NAME.matches(/^PR-.*$/)) {
hipchatSend message: "${env.BRANCH_NAME} Build: Does not match gitflow naming. Aborted", room: 'engineering' hipchatSend message: "${env.BRANCH_NAME} Build: Does not match gitflow naming. Aborted", room: 'engineering'
error "Job does not follow gitflow naming format." error "Job does not follow gitflow naming format."
} }

95
workflow/engine/methods/cases/casesStartPage_Ajax.php
View File

@@ -72,71 +72,42 @@ function getProcessList ()
} }
$processListTree = array (); $processListTree = array ();
if (1) { foreach ($processList as $key => $processInfo) {
foreach ($processList as $key => $processInfo) { $tempTree['text'] = $key;
$tempTree['text'] = $key; $tempTree['id'] = G::encryptOld($key);
$tempTree['id'] = G::encryptOld($key); $tempTree['cls'] = 'folder';
$tempTree['cls'] = 'folder'; $tempTree['draggable'] = true;
$tempTree['draggable'] = true; $tempTree['optionType'] = "category";
$tempTree['optionType'] = "category"; $tempTree['singleClickExpand'] = true;
//$tempTree['allowDrop']=false; if ($key != "No Category") {
$tempTree['singleClickExpand'] = true; $tempTree['expanded'] = true;
if ($key != "No Category") { } else {
$tempTree['expanded'] = true; $tempTree['expanded'] = true;
} else {
//$tempTree ['expanded'] = false;
$tempTree['expanded'] = true;
}
$tempTreeChildren = array ();
foreach ($processList[$key] as $keyChild => $processInfoChild) {
//print_r($processInfo);
$tempTreeChild['text'] = htmlentities($keyChild, ENT_QUOTES, 'UTF-8'); //ellipsis ( $keyChild, 50 );
//$tempTree['text']=$key;
$tempTreeChild['id'] = G::encryptOld($keyChild);
$tempTreeChild['draggable'] = true;
$tempTreeChild['leaf'] = true;
$tempTreeChild['icon'] = '/images/icon.trigger.png';
$tempTreeChild['allowChildren'] = false;
$tempTreeChild['optionType'] = "startProcess";
$tempTreeChild['pro_uid'] = $processInfoChild['pro_uid'];
$tempTreeChild['tas_uid'] = $processInfoChild['uid'];
$processInfoChild['myInbox'] = 0;
$processInfoChild['totalInbox'] = 0;
if (isset( $proData[$processInfoChild['pro_uid']] )) {
$tempTreeChild['otherAttributes'] = array_merge( $processInfoChild, $proData[$processInfoChild['pro_uid']], $calendar->getCalendarFor( $_SESSION['USER_LOGGED'], $processInfoChild['pro_uid'], $processInfoChild['uid'] ) );
$tempTreeChild['otherAttributes']['PRO_TAS_TITLE'] = str_replace( ")", "", str_replace( "(", "", trim( str_replace( $tempTreeChild['otherAttributes']['PRO_TITLE'], "", $tempTreeChild['otherAttributes']["value"] ) ) ) );
$tempTreeChild['qtip'] = $tempTreeChild['otherAttributes']['PRO_DESCRIPTION'];
//$tempTree['cls']='file';
$tempTreeChildren[] = $tempTreeChild;
}
}
$tempTree['children'] = $tempTreeChildren;
$processListTree[] = $tempTree;
} }
} else { $tempTreeChildren = array();
foreach ($processList[$node] as $key => $processInfo) { foreach ($processList[$key] as $keyChild => $processInfoChild) {
//print_r($processInfo); $tempTreeChild['text'] = $keyChild;
$tempTree['text'] = $key; //ellipsis ( $key, 50 ); $tempTreeChild['id'] = G::encryptOld($keyChild);
//$tempTree['text']=$key; $tempTreeChild['draggable'] = true;
$tempTree['id'] = $key; $tempTreeChild['leaf'] = true;
$tempTree['draggable'] = true; $tempTreeChild['icon'] = '/images/icon.trigger.png';
$tempTree['leaf'] = true; $tempTreeChild['allowChildren'] = false;
$tempTree['icon'] = '/images/icon.trigger.png'; $tempTreeChild['optionType'] = "startProcess";
$tempTree['allowChildren'] = false; $tempTreeChild['pro_uid'] = $processInfoChild['pro_uid'];
$tempTree['optionType'] = "startProcess"; $tempTreeChild['tas_uid'] = $processInfoChild['uid'];
$tempTree['pro_uid'] = $processInfo['pro_uid']; $processInfoChild['myInbox'] = 0;
$tempTree['tas_uid'] = $processInfo['uid']; $processInfoChild['totalInbox'] = 0;
$processInfo['myInbox'] = 0; if (isset($proData[$processInfoChild['pro_uid']])) {
$processInfo['totalInbox'] = 0; $tempTreeChild['otherAttributes'] = array_merge($processInfoChild, $proData[$processInfoChild['pro_uid']], $calendar->getCalendarFor($_SESSION['USER_LOGGED'], $processInfoChild['pro_uid'], $processInfoChild['uid']));
$tempTree['otherAttributes'] = array_merge( $processInfo, $proData[$processInfo['pro_uid']], $calendar->getCalendarFor( $processInfo['uid'], $processInfo['uid'], $processInfo['uid'] ) ); $tempTreeChild['otherAttributes']['PRO_TAS_TITLE'] = str_replace(")", "", str_replace("(", "", trim(str_replace($tempTreeChild['otherAttributes']['PRO_TITLE'], "", $tempTreeChild['otherAttributes']["value"]))));
$tempTree['otherAttributes']['PRO_TAS_TITLE'] = str_replace( ")", "", str_replace( "(", "", trim( str_replace( $tempTree['otherAttributes']['PRO_TITLE'], "", $tempTree['otherAttributes']["value"] ) ) ) ); $tempTreeChild['qtip'] = $tempTreeChild['otherAttributes']['PRO_DESCRIPTION'];
$tempTree['qtip'] = $tempTree['otherAttributes']['PRO_DESCRIPTION']; $tempTreeChildren[] = $tempTreeChild;
//$tempTree['cls']='file'; }
$processListTree[] = $tempTree;
} }
$tempTree['children'] = $tempTreeChildren;
$processListTree[] = $tempTree;
} }
$processList = $processListTree; $processList = $processListTree;
} else { } else {
$processList['success'] = 'failure'; $processList['success'] = 'failure';

12
workflow/engine/templates/processes/main.js
View File

@@ -820,7 +820,6 @@ function newProcess(params)
xtype:'textfield', xtype:'textfield',
width: 260, width: 260,
maxLength: 100, maxLength: 100,
maskRe: /^(?!^(PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\...*)(\..+)?$)[^\x00-\x1f\\?*\";|/]+$/i,
allowBlank: false, allowBlank: false,
vtype: "textWithoutTags", vtype: "textWithoutTags",
autoCreate: {tag: 'input', type: 'text', size: '100', autocomplete: 'off', maxlength: '100'}, autoCreate: {tag: 'input', type: 'text', size: '100', autocomplete: 'off', maxlength: '100'},
@@ -837,16 +836,7 @@ function newProcess(params)
xtype:'textarea', xtype:'textarea',
width: 260 width: 260
}, },
ProcessCategories/*, ProcessCategories
{
id: 'editor',
xtype: 'radiogroup',
fieldLabel: _('ID_OPEN_WITH'),
items: [
{boxLabel: _('ID_CLASSIC_EDITOR'), name: 'editor', inputValue: 'classic', checked: true},
{boxLabel: _('ID_BPMN_EDITOR'), name: 'editor', inputValue: 'bpmn'}
]
}*/
], ],
buttons : [{ buttons : [{
text : _('ID_CREATE'), text : _('ID_CREATE'),