From f7e194b0b4273b9368ba2c2cc9f2e184add4c79d Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 23 Jul 2018 12:53:41 -0600 Subject: [PATCH] Respect no_actions flag in controller_selection when selecting a range / all --- api/js/etemplate/et2_dataview_controller.js | 5 +++++ api/js/etemplate/et2_dataview_controller_selection.js | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/api/js/etemplate/et2_dataview_controller.js b/api/js/etemplate/et2_dataview_controller.js index 20cc6ee88c..2c906c57a9 100644 --- a/api/js/etemplate/et2_dataview_controller.js +++ b/api/js/etemplate/et2_dataview_controller.js @@ -669,6 +669,11 @@ var et2_dataview_controller = (function(){ "use strict"; return Class.extend({ this.self._selectionMgr.registerRow(this.entry.uid, this.entry.idx, tr, links); } + else + { + // Remember that + this.entry.no_actions = true; + } // Invalidate the current row entry this.entry.row.invalidate(); diff --git a/api/js/etemplate/et2_dataview_controller_selection.js b/api/js/etemplate/et2_dataview_controller_selection.js index 3ffebcb237..6da0bf6eea 100644 --- a/api/js/etemplate/et2_dataview_controller_selection.js +++ b/api/js/etemplate/et2_dataview_controller_selection.js @@ -565,8 +565,11 @@ var et2_dataview_selectionManager = (function(){ "use strict"; return Class.exte naStart = false; } - // Select the element - this.setSelected(this._indexMap[i].uid, true); + // Select the element, unless flagged for exclusion + if(!this._indexMap[i].no_actions) + { + this.setSelected(this._indexMap[i].uid, true); + } } else if(i >= range_break) {