Fix one last broken link in polygerrit if using prefixed url.
Bug: Issue 6025
Change-Id: I3f10ab98740195f55572d33bd96140302a64f38a
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
index 057dd1d..afe0e38 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
@@ -14,6 +14,7 @@
limitations under the License.
-->
+<link rel="import" href="../../../behaviors/base-url-behavior/base-url-behavior.html">
<link rel="import" href="../../../behaviors/gr-url-encoding-behavior.html">
<link rel="import" href="../../../bower_components/polymer/polymer.html">
<link rel="import" href="../../shared/gr-rest-api-interface/gr-rest-api-interface.html">
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.js b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.js
index b2e8051..82d85ac 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.js
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.js
@@ -28,7 +28,11 @@
* @event title-change
*/
- behaviors: [Gerrit.URLEncodingBehavior],
+ behaviors: [
+ Gerrit.BaseUrlBehavior,
+ Gerrit.URLEncodingBehavior,
+ ],
+
properties: {
/**
* URL params passed from the router.
@@ -140,7 +144,7 @@
offset = +(offset || 0);
var newOffset = Math.max(0, offset + (changesPerPage * direction));
// Double encode URI component.
- var href = '/q/' + this.encodeURL(query, false);
+ var href = this.getBaseUrl() + '/q/' + this.encodeURL(query, false);
if (newOffset > 0) {
href += ',' + newOffset;
}
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_test.html b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_test.html
index 0097a50..661dd2c 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_test.html
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_test.html
@@ -89,6 +89,26 @@
'/q/status:open,10');
});
+ test('_computeNavLink with path', function() {
+ window.CANONICAL_PATH = '/r';
+ var query = 'status:open';
+ var offset = 0;
+ var direction = 1;
+ var changesPerPage = 5;
+ assert.equal(
+ element._computeNavLink(query, offset, direction, changesPerPage),
+ '/r/q/status:open,5');
+ direction = -1;
+ assert.equal(
+ element._computeNavLink(query, offset, direction, changesPerPage),
+ '/r/q/status:open');
+ offset = 5;
+ direction = 1;
+ assert.equal(
+ element._computeNavLink(query, offset, direction, changesPerPage),
+ '/r/q/status:open,10');
+ });
+
test('_hidePrevArrow', function() {
var offset = 0;
assert.isTrue(element._hidePrevArrow(offset));
diff --git a/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager.html b/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager.html
index 2d7d2a9..5765411 100644
--- a/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager.html
+++ b/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager.html
@@ -14,6 +14,7 @@
limitations under the License.
-->
+<link rel="import" href="../../../behaviors/base-url-behavior/base-url-behavior.html">
<link rel="import" href="../../../bower_components/polymer/polymer.html">
<link rel="import" href="../../shared/gr-alert/gr-alert.html">
<link rel="import" href="../../shared/gr-rest-api-interface/gr-rest-api-interface.html">
diff --git a/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager.js b/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager.js
index 1e609c9..22349de 100644
--- a/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager.js
+++ b/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager.js
@@ -25,6 +25,10 @@
Polymer({
is: 'gr-error-manager',
+ behaviors: [
+ Gerrit.BaseUrlBehavior,
+ ],
+
properties: {
/**
* The ID of the account that was logged in when the app was launched. If
@@ -207,7 +211,8 @@
'left=' + left,
'top=' + top,
];
- window.open('/login/%3FcloseAfterLogin', '_blank', options.join(','));
+ window.open(this.getBaseUrl() +
+ '/login/%3FcloseAfterLogin', '_blank', options.join(','));
this.listen(window, 'focus', '_handleWindowFocus');
},
