You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by up...@apache.org on 2015/11/04 12:54:43 UTC
svn commit: r1712540 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/webapp/ solr/webapp/web/js/angular/controllers/analysis.js
solr/webapp/web/js/angular/controllers/query.js
Author: upayavira
Date: Wed Nov 4 11:54:43 2015
New Revision: 1712540
URL: http://svn.apache.org/viewvc?rev=1712540&view=rev
Log:
SOLR-7666 Fix URL handling in query and analysis panes
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/analysis.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/analysis.js?rev=1712540&r1=1712539&r2=1712540&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/analysis.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/analysis.js Wed Nov 4 11:54: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/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js?rev=1712540&r1=1712539&r2=1712540&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js Wed Nov 4 11:54: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: ""}];