diff options
author | Paul Slaughter <pslaughter@gitlab.com> | 2018-05-29 07:28:49 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-05-29 07:28:49 +0000 |
commit | 67199aed62654657488f2b84bae8fe04e6cc7060 (patch) | |
tree | f24a242817e34e6fcc379aedd59f920eebfca7af /app/assets/javascripts | |
parent | 6e354cb642f911dc71be3d5368f066900fc25970 (diff) | |
download | gitlab-ce-67199aed62654657488f2b84bae8fe04e6cc7060.tar.gz |
Add helpful messages to empty wiki view
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/pages/projects/wikis/wikis.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/projects/wikis/wikis.js b/app/assets/javascripts/pages/projects/wikis/wikis.js index 34a12ef76a1..dcd0b9a76ce 100644 --- a/app/assets/javascripts/pages/projects/wikis/wikis.js +++ b/app/assets/javascripts/pages/projects/wikis/wikis.js @@ -1,5 +1,7 @@ import bp from '../../../breakpoints'; import { slugify } from '../../../lib/utils/text_utility'; +import { parseQueryStringIntoObject } from '../../../lib/utils/common_utils'; +import { mergeUrlParams, redirectTo } from '../../../lib/utils/url_utility'; export default class Wikis { constructor() { @@ -28,7 +30,12 @@ export default class Wikis { if (slug.length > 0) { const wikisPath = slugInput.getAttribute('data-wikis-path'); - window.location.href = `${wikisPath}/${slug}`; + + // If the wiki is empty, we need to merge the current URL params to keep the "create" view. + const params = parseQueryStringIntoObject(window.location.search.substr(1)); + const url = mergeUrlParams(params, `${wikisPath}/${slug}`); + redirectTo(url); + e.preventDefault(); } } |