Fix params loading & merging.

Fix SearchEngine advanced panel when no metadata fields registered for indexation.

Author: cdujeu

core/src/core/classes/class.AJXP_Plugin.php

@@ -552,9 +552,10 @@ protected function loadConfigsDefinitions()
         $params = $this->xPath->query("//server_settings/global_param|//server_settings/param");
         $this->pluginConf = array();
         foreach ($params as $xmlNode) {
+            $global = ($xmlNode->nodeName == "global_param");
             $paramNode = $this->nodeAttrToHash($xmlNode);
             $this->pluginConfDefinition[$paramNode["name"]] = $paramNode;
-            if (isset($paramNode["default"])) {
+            if ($global && isset($paramNode["default"])) {
                 if ($paramNode["type"] == "boolean") {
                     $paramNode["default"] = ($paramNode["default"] === "true" ? true: false);
                 } else if ($paramNode["type"] == "integer") {

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

@@ -65,6 +65,9 @@ Class.create("SearchEngine", AjxpPane, {
             this._ajxpOptions = Object.extend(this._ajxpOptions, ajxpOptions);
         }
 		$super($(mainElementName), this._ajxpOptions);
+
+        if(!this._ajxpOptions.metaColumns) this._ajxpOptions.metaColumns = {};
+
         this.updateSearchModeFromRegistry();
         this.searchModeObserver = this.updateSearchModeFromRegistry.bind(this);
         document.observe("ajaxplorer:registry_loaded", this.searchModeObserver);