From dbbad57f90ebccfa639289c2df0c86d78fdcebf6 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 6 Mar 2014 18:07:47 +0000 Subject: [PATCH] Fix selecting next entry when there are no others --- etemplate/js/et2_dataview_controller_selection.js | 2 +- etemplate/js/et2_extension_nextmatch.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etemplate/js/et2_dataview_controller_selection.js b/etemplate/js/et2_dataview_controller_selection.js index 276377effb..bef117073e 100644 --- a/etemplate/js/et2_dataview_controller_selection.js +++ b/etemplate/js/et2_dataview_controller_selection.js @@ -345,7 +345,7 @@ var et2_dataview_selectionManager = Class.extend( var count = Math.max(1,Math.min(self._total,50)); var element = null; var idx = _entry.idx; - while(element == null && count > 0) + while(element == null && count > 0 && max_index > 0) { count--; element = getIndexAO(Math.max(0, diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js index 97c14e3e5c..79d6067809 100644 --- a/etemplate/js/et2_extension_nextmatch.js +++ b/etemplate/js/et2_extension_nextmatch.js @@ -489,7 +489,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput], var uid = (this.controller.dataStorePrefix || app) + "::" + _row_ids[0]; var entry = this.controller._selectionMgr._getRegisteredRowsEntry(uid); var next = (entry.ao?entry.ao.getNext(_row_ids.length):null); - if(next == null || !next.id) + if(next == null || !next.id || next.id == uid) { // No next, select previous next = (entry.ao?entry.ao.getPrevious(1):null);