Repository: nifi Updated Branches: refs/heads/master 7a5560c33 -> 9a2f8c598
NIFI-2441 This closes #766. 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. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9a2f8c59 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9a2f8c59 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9a2f8c59 Branch: refs/heads/master Commit: 9a2f8c598e7e067b371a6cb8f67f227e982f5b9a Parents: 7a5560c Author: Koji Kawamura <ijokaruma...@apache.org> Authored: Tue Aug 2 10:58:48 2016 +0900 Committer: joewitt <joew...@apache.org> Committed: Mon Aug 1 22:54:37 2016 -0400 ---------------------------------------------------------------------- .../main/webapp/js/nf/canvas/nf-component-state.js | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/9a2f8c59/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js ---------------------------------------------------------------------- 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 c92942b..ce659d7 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
