New option "leavesOpenOnSelect" on search engine used in the admin panel, to avoid never-ending searching on the correct user page. Fix #814

Author: cdujeu

core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php

@@ -255,7 +255,7 @@ public function recursiveSearchGroups($baseGroup, $term)
                 "ajxp_mime" => "user"
             );
             if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-            echo AJXP_XMLWriter::renderNode($nodeKey, $userId, false, $meta, true, false);
+            echo AJXP_XMLWriter::renderNode($nodeKey, $userId, true, $meta, true, false);
 
         }
 

core/src/plugins/access.ajxp_conf/manifest.xml

@@ -88,7 +88,7 @@
                     <div ajxpClass="AjxpTabulator" id="leftTabulator" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"ajxp_conf.122","iconClass":"icon-cogs","element":"leftPane"},{"id":"flagged","label":"147","iconClass":"icon-bookmark","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
                         <div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"get_bookmarks", "format":"node_list"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
                         <div id="leftPane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                            <div id="search_container_settings" class="settings_search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":10, "groupByData":false}'></div>
+                            <div id="search_container_settings" class="settings_search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":10, "groupByData":false, "leavesOpenOnSelect": true}'></div>
                             <div id="settings_pane" class="flat_tree_pane" ajxpClass="FoldersTree" ajxpOptions='{"fit":"height", "fitParent":"leftPane", "display":"dz","replaceScroller":true}' ></div>
                         </div>
                     </div>

core/src/plugins/gui.ajax/res/js/ajaxplorer/class.RemoteNodeProvider.js

@@ -155,7 +155,7 @@ Class.create("RemoteNodeProvider", {
 		    if(console){
 		         console.log(transport.responseText);
 		    }
-		    nodeCallback(origNode);
+		    if(nodeCallback) nodeCallback(origNode);
 		    origNode.setLoaded(false);
 		    throw new Error('Invalid XML Document (see console)');
 		}

core/src/plugins/gui.ajax/res/js/ajaxplorer/class.SearchEngine.js

@@ -81,7 +81,12 @@ Class.create("SearchEngine", AjxpPane, {
                  if(this._ajxpOptions.openSearchInput){
                      this.closeSearchInput();
                  }
-                 ajaxplorer.goTo(selectedNode);
+                 if(ajxpOptions['leavesOpenOnSelect'] && selectedNode.isLeaf()){
+                     ajaxplorer.openCurrentSelectionInEditor(null, selectedNode);
+                 }else{
+                     ajaxplorer.goTo(selectedNode);
+                 }
+                 this._dataModel.setSelectedNodes([]);
              }
          }.bind(this));