diff options
author | Paladox none <thomasmulhall410@yahoo.com> | 2017-04-14 17:39:05 +0000 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2017-04-19 09:34:12 +0000 |
commit | 363019c9c64c09d76f4b3c75490712d042b16504 (patch) | |
tree | 16fa1cca7ac8a5813b43dea669974a4455a766b9 | |
parent | 132bfcbf4ca844658cdd0c9cea6c9b289981771c (diff) |
Fix one last broken link in polygerrit if using prefixed url.
Bug: Issue 6025
Change-Id: I3f10ab98740195f55572d33bd96140302a64f38a
5 files changed, 34 insertions, 3 deletions
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 057dd1d118..afe0e389d8 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 @@ See the License for the specific language governing permissions and 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 b2e8051efd..82d85acd49 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 0097a50a24..661dd2c7ec 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 @@ limitations under the License. '/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 80f293d7b9..e3f2bbc15e 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 @@ See the License for the specific language governing permissions and 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 8209cdee4b..d48d87030c 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 @@ -24,6 +24,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 @@ -204,7 +208,8 @@ 'left=' + left, 'top=' + top, ]; - window.open('/login/%3FcloseAfterLogin', '_blank', options.join(',')); + window.open(this.getBaseUrl() + + '/login/%3FcloseAfterLogin', '_blank', options.join(',')); }, _handleCredentialRefreshed: function() { |