diff options
author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-05-03 14:41:28 +0300 |
---|---|---|
committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-05-03 14:41:28 +0300 |
commit | c9b5c42b1862675ad43e4e8e7411f7048be8abfc (patch) | |
tree | 639d526bd21fbddfa97ca6078bf06172bb3ec5fe /app/assets/javascripts/pages | |
parent | 86b8fd3b1aa8b5724d4aa425f43a812519a4c8d0 (diff) |
Added commit form fields for delete page confirmation
Diffstat (limited to 'app/assets/javascripts/pages')
-rw-r--r-- | app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue | 58 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/wikis/index.js | 5 |
2 files changed, 54 insertions, 9 deletions
diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue index 6a4d3f56229..af0b86ea816 100644 --- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue +++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue @@ -1,6 +1,7 @@ <script> +import _ from 'underscore'; import GlModal from '~/vue_shared/components/gl_modal.vue'; - import { s__} from '~/locale'; +import { s__, sprintf } from '~/locale'; export default { components: { @@ -12,6 +13,11 @@ export default { required: false, default: '', }, + pageTitle: { + type: String, + required: false, + default: '', + }, csrfToken: { type: String, required: false, @@ -19,8 +25,22 @@ export default { }, }, computed: { - text() { - return s__('WikiPageConfirmDelete|Are you sure you want to delete this page?') + message() { + return sprintf(s__('WikiPageConfirmDelete|Delete %{pageTitle}'), + { + pageTitle: _.escape(this.pageTitle), + }, + false, + ); + }, + + title() { + return sprintf(s__('WikiPageConfirmDelete|Delete Page %{pageTitle}?'), + { + pageTitle: `'${_.escape(this.pageTitle)}'`, + }, + false, + ); } }, methods: { @@ -34,17 +54,16 @@ export default { <template> <gl-modal id="delete-wiki-modal" - :header-title-text="s__('WikiPageConfirmDelete|Delete Wiki?')" + :header-title-text="title" footer-primary-button-variant="danger" - :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete')" + :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete Page')" @submit="onSubmit" > - {{ text }} - <form ref="form" :action="deleteWikiUrl" method="post" + class="form-horizontal js-requires-input" > <input ref="method" @@ -57,6 +76,31 @@ export default { name="authenticity_token" :value="csrfToken" /> + + <div class="form-group"> + <div class="col-sm-12"> + <label for="commit_message" class="control-label-full-width">Commit Message</label> + </div> + <div class="col-sm-12"> + <div class="commit-message-container"> + <textarea + id="commit_message" + rows="3" + name="commit_message" + :value="message" + class="form-control js-commit-message" required></textarea> + </div> + + </div> + </div> + <div class="form-group"> + <div class="col-sm-12"> + <label for="branch_name" class="control-label-full-width">Target Branch</label> + </div> + <div class="col-sm-12"> + <input type="text" name="branch_name" class="form-control js-commit-message ref-name" required /> + </div> + </div> </form> </gl-modal> </template> diff --git a/app/assets/javascripts/pages/projects/wikis/index.js b/app/assets/javascripts/pages/projects/wikis/index.js index 467f65541ec..169fa5d85a8 100644 --- a/app/assets/javascripts/pages/projects/wikis/index.js +++ b/app/assets/javascripts/pages/projects/wikis/index.js @@ -15,9 +15,9 @@ document.addEventListener('DOMContentLoaded', () => { new GLForm($('.wiki-form'), true); // eslint-disable-line no-new Vue.use(Translate); - const { deleteWikiUrl } = document.getElementById('delete-wiki-button').dataset; + const { deleteWikiUrl, pageTitle } = document.getElementById('delete-wiki-button').dataset; const deleteWikiModalEl = document.getElementById('delete-wiki-modal'); - const deleteModal = new Vue({ + const deleteModal = new Vue({ // eslint-disable-line el: deleteWikiModalEl, data: { deleteWikiUrl: '', @@ -25,6 +25,7 @@ document.addEventListener('DOMContentLoaded', () => { render(createElement) { return createElement(deleteWikiModal, { props: { + pageTitle, deleteWikiUrl, csrfToken: csrf.token, }, |