lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbern...@apache.org
Subject lucene-solr:master: SOLR-12997: Fix broken link on admin Stream panel
Date Sun, 18 Nov 2018 19:24:14 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master d17c6d889 -> a0788a7b5


SOLR-12997: Fix broken link on admin Stream panel


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a0788a7b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a0788a7b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a0788a7b

Branch: refs/heads/master
Commit: a0788a7b5e51fc48ee26f018819f66323810f1cb
Parents: d17c6d8
Author: Joel Bernstein <jbernste@apache.org>
Authored: Sun Nov 18 14:23:07 2018 -0500
Committer: Joel Bernstein <jbernste@apache.org>
Committed: Sun Nov 18 14:24:02 2018 -0500

----------------------------------------------------------------------
 solr/webapp/web/js/angular/controllers/stream.js | 5 ++---
 solr/webapp/web/partials/stream.html             | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0788a7b/solr/webapp/web/js/angular/controllers/stream.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/controllers/stream.js b/solr/webapp/web/js/angular/controllers/stream.js
index 7c3bcce..92440c3 100644
--- a/solr/webapp/web/js/angular/controllers/stream.js
+++ b/solr/webapp/web/js/angular/controllers/stream.js
@@ -59,9 +59,8 @@ solrAdminApp.controller('StreamController',
 
         $scope.lang = "json";
         $scope.response = data;
-        $scope.url = $location.protocol() + "://" +
-          $location.host() + ":" +
-          $location.port() + url;
+        $scope.url = url;
+        $scope.hostPortContext = $location.absUrl().substr(0,$location.absUrl().indexOf("#"));
// For display only
 
       });
     };

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0788a7b/solr/webapp/web/partials/stream.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/stream.html b/solr/webapp/web/partials/stream.html
index 0d1154e..683cf76 100644
--- a/solr/webapp/web/partials/stream.html
+++ b/solr/webapp/web/partials/stream.html
@@ -34,7 +34,7 @@ limitations under the License.
 
   <div id="result">
 
-    <a ng-show="response.data" id="url" class="address-bar" ng-href="{{url}}">{{url}}</a>
+    <a ng-show="response.data" id="url" class="address-bar" ng-href="{{url}}">{{hostPortContext}}{{url}}</a>
 
     <div ng-show="showExplanation" id="explanation" class="clearfix">
       <div id="frame">


Mime
View raw message