From ed8fd96ed3ecccba5196a2457591ba450b50bfa0 Mon Sep 17 00:00:00 2001 From: Koji Kawamura Date: Tue, 2 Aug 2016 10:58:48 +0900 Subject: [PATCH] NIFI-2441: View state fails with a JS error Removed permission check causing "Cannot read property 'canRead' of undefined". A given user won't have record level permission difference for component state. It's not required here. --- .../webapp/js/nf/canvas/nf-component-state.js | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js index c92942b50540..ce659d7849d4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js @@ -90,20 +90,9 @@ nf.ComponentState = (function () { var sort = function (sortDetails, data) { // defines a function for sorting var comparer = function (a, b) { - if(a.permissions.canRead && b.permissions.canRead) { - var aString = nf.Common.isDefinedAndNotNull(a.component[sortDetails.columnId]) ? a.component[sortDetails.columnId] : ''; - var bString = nf.Common.isDefinedAndNotNull(b.component[sortDetails.columnId]) ? b.component[sortDetails.columnId] : ''; - return aString === bString ? 0 : aString > bString ? 1 : -1; - } else { - if (!a.permissions.canRead && !b.permissions.canRead){ - return 0; - } - if(a.permissions.canRead){ - return 1; - } else { - return -1; - } - } + var aString = nf.Common.isDefinedAndNotNull(a[sortDetails.columnId]) ? a[sortDetails.columnId] : ''; + var bString = nf.Common.isDefinedAndNotNull(b[sortDetails.columnId]) ? b[sortDetails.columnId] : ''; + return aString === bString ? 0 : aString > bString ? 1 : -1; }; // perform the sort