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

HOR-2877 Missing changes apply.

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-03-16 16:21:11 -04:00
parent 7dc9dd807b
commit ceb06249d1
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
View File

@@ -681,13 +681,14 @@ class Consolidated
return Ext.isDate(value)? value.dateFormat('{$dateFormat}') : value; return Ext.isDate(value)? value.dateFormat('{$dateFormat}') : value;
} *"; } *";
if ($field->mode == "view") {
$editor = null;
}
//Important for windows servers, because the character '\r' //Important for windows servers, because the character '\r'
//breaks the json definition. //breaks the json definition.
$editor = $this->removeLineBreaks($editor); $editor = $this->removeLineBreaks($editor);
$renderer = $this->removeLineBreaks($renderer);
if ($field->mode == "view") {
$editor = null;
}
$caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true); $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
$caseReaderFields[] = array("name" => $field->name, "type" => "date"); $caseReaderFields[] = array("name" => $field->name, "type" => "date");

5
workflow/engine/templates/cases/casesListConsolidated.js
View File

@@ -848,13 +848,16 @@ function generateGrid(proUid, tasUid, dynUid) {
} }
function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber, fieldGridGral, fieldGridGralVal) { function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber, fieldGridGral, fieldGridGralVal) {
if (fieldGridGralVal !== null) {
fieldGridGralVal = stringReplace("\\x2F", "__FRASL__", fieldGridGralVal);
}
Ext.Ajax.request({ Ext.Ajax.request({
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': 'Bearer ' + credentials.access_token 'Authorization': 'Bearer ' + credentials.access_token
}, },
url: urlProxy + 'derivate/' + appUid + '/' + appNumber + '/' + delIndex + '/' + fieldGridGral + '/' + stringReplace("\\x2F", "__FRASL__", fieldGridGralVal) + '/', url: urlProxy + 'derivate/' + appUid + '/' + appNumber + '/' + delIndex + '/' + fieldGridGral + '/' + fieldGridGralVal + '/',
success: function (response) { success: function (response) {
var dataResponse; var dataResponse;
var fullResponseText = response.responseText; var fullResponseText = response.responseText;