diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 22:44:06 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 22:44:06 +0300 |
commit | 0cc060bc5fe3ba354979fa0be9e4cc2a2887d5f4 (patch) | |
tree | 5b5a75effa67e233496bd02551705ccd86936d64 /app/assets/javascripts/lib | |
parent | 3c2d0cf24c02e02295fd0b6b978b3f191ab4f847 (diff) | |
parent | 5cca2d3bb171c260ad4b07f2a69962d3856c4d99 (diff) |
Merge branch 'issue-filter-name-options' into 'master'
Issuable filtering improvements
This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.
Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252
Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269
See merge request !3699
Diffstat (limited to 'app/assets/javascripts/lib')
-rw-r--r-- | app/assets/javascripts/lib/url_utility.js.coffee | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/url_utility.js.coffee b/app/assets/javascripts/lib/url_utility.js.coffee index 6a00932c028..e8085e1c2e4 100644 --- a/app/assets/javascripts/lib/url_utility.js.coffee +++ b/app/assets/javascripts/lib/url_utility.js.coffee @@ -26,10 +26,19 @@ newUrl = decodeURIComponent(url) for paramName, paramValue of params pattern = new RegExp "\\b(#{paramName}=).*?(&|$)" - if url.search(pattern) >= 0 + if not paramValue? + newUrl = newUrl.replace pattern, '' + else if url.search(pattern) isnt -1 newUrl = newUrl.replace pattern, "$1#{paramValue}$2" else newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}" + + # Remove a trailing ampersand + lastChar = newUrl[newUrl.length - 1] + + if lastChar is '&' + newUrl = newUrl.slice 0, -1 + newUrl # removes parameter query string from url. returns the modified url |