svn commit: r1712539 - in /lucene/dev/trunk/solr/webapp/web/js/angular/controllers: analysis.js query.js

[up...@apache.org]

Author: upayavira
Date: Wed Nov  4 11:53:43 2015
New Revision: 1712539

URL: http://svn.apache.org/viewvc?rev=1712539&view=rev
Log:
SOLR-7666 Fix URL handling in query and analysis panes

Modified:
    lucene/dev/trunk/solr/webapp/web/js/angular/controllers/analysis.js
    lucene/dev/trunk/solr/webapp/web/js/angular/controllers/query.js

Modified: lucene/dev/trunk/solr/webapp/web/js/angular/controllers/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/angular/controllers/analysis.js?rev=1712539&r1=1712538&r2=1712539&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/angular/controllers/analysis.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/angular/controllers/analysis.js Wed Nov  4 11:53:43 2015
@@ -119,9 +119,13 @@ solrAdminApp.controller('AnalysisControl
 
         if ($scope.indexText) {
             $location.search("analysis.fieldvalue", $scope.indexText);
+        } else if ($location.search()["analysis.fieldvalue"]) {
+            $location.search("analysis.fieldvalue", null);
         }
         if ($scope.queryText) {
           $location.search("analysis.query", $scope.queryText);
+        } else if ($location.search()["analysis.query"]) {
+            $location.search("analysis.query", null);
         }
 
         if (fieldOrType == "fieldname") {
@@ -164,7 +168,7 @@ solrAdminApp.controller('AnalysisControl
             var parts = $scope.fieldOrType.split("=");
             var fieldOrType = parts[0] == "fieldname" ? "field_names" : "field_types";
 
-              Analysis.field(params, function(data) {
+            Analysis.field(params, function(data) {
               $scope.result = processAnalysisData(data.analysis, fieldOrType);
             });
           }
@@ -181,7 +185,7 @@ solrAdminApp.controller('AnalysisControl
 
       $scope.toggleVerbose = function() {
         $scope.verbose = !$scope.verbose;
-        $location.search("verbose_output", $scope.verbose ? "1" : "0");
+        $scope.updateQueryString();
       };
 
       $scope.refresh();

Modified: lucene/dev/trunk/solr/webapp/web/js/angular/controllers/query.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/angular/controllers/query.js?rev=1712539&r1=1712538&r2=1712539&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/angular/controllers/query.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/angular/controllers/query.js Wed Nov  4 11:53:43 2015
@@ -30,10 +30,6 @@ solrAdminApp.controller('QueryController
     $scope.spellcheck = {spellcheck:"on"};
     $scope.qt = "/select";
 
-    if ($location.search().q) {
-      $scope.query.q = $location.search()["q"];
-    }
-
     $scope.doQuery = function() {
       var params = {};
 
@@ -89,6 +85,11 @@ solrAdminApp.controller('QueryController
       });
     };
 
+    if ($location.search().q) {
+      $scope.query.q = $location.search()["q"];
+      $scope.doQuery();
+    }
+
     $scope.removeFilter = function(index) {
       if ($scope.filters.length === 1) {
         $scope.filters = [{fq: ""}];