fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/develop' into bugfix/HOR-2887

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-05-24 09:04:40 -04:00
parent c35c6db260 f984d334c0
commit 14b5555fc6
521 changed files with 63136 additions and 17249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -587,13 +587,16 @@ Ext.onReady ( function() {
}
//Render Full Name
full_name = function(v, x, s) {
full_name = function (v, x, s) {
var resp;
if (s.data.USR_UID && s.data.USR_USERNAME) {
return _FNF(s.data.USR_USERNAME, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
}
else {
return '[' + _('ID_UNASSIGNED').toUpperCase() + ']';
resp = _FNF(s.data.USR_USERNAME, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
} else if (s && s.json && s.json["APP_TAS_TYPE"] === "SUBPROCESS") {
resp = '';
} else {
resp = '[' + _('ID_UNASSIGNED').toUpperCase() + ']';
}
return resp;
};
previous_full_name = function(v, x, s) {

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

@@ -820,7 +820,6 @@ function newProcess(params)
xtype:'textfield',
width: 260,
maxLength: 100,
maskRe: /^(?!^(PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\...*)(\..+)?$)[^\x00-\x1f\\?*\";|/]+$/i,
allowBlank: false,
vtype: "textWithoutTags",
autoCreate: {tag: 'input', type: 'text', size: '100', autocomplete: 'off', maxlength: '100'},
@@ -837,16 +836,7 @@ function newProcess(params)
xtype:'textarea',
width: 260
},
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'}
]
}*/
ProcessCategories
],
buttons : [{
text : _('ID_CREATE'),