diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-06-26 22:59:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 22:59:30 +0200 |
| commit | de80a6c015fb0d63040a111288be26b2118684a4 (patch) | |
| tree | 7829af10f8a3b844c8f7ab0018194c170f41bd4e /extensions/BugModal | |
| parent | a685e15218fbe7d26015a579c96caf7de783732d (diff) | |
| download | bugzilla-de80a6c015fb0d63040a111288be26b2118684a4.tar.gz bugzilla-de80a6c015fb0d63040a111288be26b2118684a4.tar.xz | |
Revert "Bug 1468848 - Change presentation of show_bug.cgi urls to be /bug/ID or /bug/ALIAS."
This reverts commit 404dc5496967203c5f99755340f43d712420446a.
Diffstat (limited to 'extensions/BugModal')
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/header.html.tmpl | 1 | ||||
| -rw-r--r-- | extensions/BugModal/web/bug_modal.js | 18 |
2 files changed, 7 insertions, 12 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl index c5ae78af3..b9a42caf3 100644 --- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl @@ -89,7 +89,6 @@ [%# expose useful data to js %] BUGZILLA.bug_id = [% bug.id FILTER none %]; BUGZILLA.bug_title = '[% unfiltered_title FILTER js %]'; - BUGZILLA.bug_alias = '[% bug.alias FILTER js %]'; BUGZILLA.user = { id: [% user.id FILTER none %], login: '[% user.login FILTER js %]', diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js index ef015d3f9..d232c172a 100644 --- a/extensions/BugModal/web/bug_modal.js +++ b/extensions/BugModal/web/bug_modal.js @@ -1435,19 +1435,15 @@ function show_new_changes_indicator() { // fix url after bug creation/update if (history && history.replaceState) { - let bug_id = BUGZILLA.bug_id; - let bug_alias = BUGZILLA.bug_alias; - let bug_slug = bug_alias || bug_id; - let url = new URL(document.location.href); - if (!url.pathname.match(/^bug\/[0-9]+/)) { - url.searchParams.delete("id"); - let new_url = url.search ? `/bug/${bug_slug}${url.search}` : `/bug/${bug_slug}`; - if (url.hash) { - new_url += url.hash; - } - history.replaceState(null, BUGZILLA.bug_title, new_url); + var href = document.location.href; + if (!href.match(/show_bug\.cgi/)) { + history.replaceState(null, BUGZILLA.bug_title, 'show_bug.cgi?id=' + BUGZILLA.bug_id); document.title = BUGZILLA.bug_title; } + if (href.match(/show_bug\.cgi\?.*list_id=/)) { + href = href.replace(/[\?&]+list_id=(\d+|cookie)/, ''); + history.replaceState(null, BUGZILLA.bug_title, href); + } } // ajax wrapper, to simplify error handling and auth |