From ceb06249d17ab6dce88e69041c55be944fde329c Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Thu, 16 Mar 2017 16:21:11 -0400
Subject: [PATCH] HOR-2877 Missing changes apply.

---
 .../src/ProcessMaker/BusinessModel/Consolidated.php      | 9 +++++----
 workflow/engine/templates/cases/casesListConsolidated.js | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
index 94eedcb18..174f18f3e 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
@@ -681,13 +681,14 @@ class Consolidated
                                      return Ext.isDate(value)? value.dateFormat('{$dateFormat}') : value;
                                    } *";
 
-                    if ($field->mode == "view") {
-                        $editor = null;
-                    }
-
                     //Important for windows servers, because the character '\r' 
                     //breaks the json definition.
                     $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);
                     $caseReaderFields[] = array("name" => $field->name, "type" => "date");
diff --git a/workflow/engine/templates/cases/casesListConsolidated.js b/workflow/engine/templates/cases/casesListConsolidated.js
index cd1f0171b..651940906 100644
--- a/workflow/engine/templates/cases/casesListConsolidated.js
+++ b/workflow/engine/templates/cases/casesListConsolidated.js
@@ -848,13 +848,16 @@ function generateGrid(proUid, tasUid, dynUid) {
 }
 
 function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber, fieldGridGral, fieldGridGralVal) {
+    if (fieldGridGralVal !== null) {
+        fieldGridGralVal = stringReplace("\\x2F", "__FRASL__", fieldGridGralVal);
+    }
     Ext.Ajax.request({
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
             '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) {
             var dataResponse;
             var fullResponseText = response.responseText;