Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6948b56c
Commit
6948b56c
authored
May 07, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added modal message and removed traget branch and commit message fields for delete wiki page modal
parent
a3b73e26
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
40 deletions
+10
-40
app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
...pts/pages/projects/wikis/components/delete_wiki_modal.vue
+10
-40
No files found.
app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
View file @
6948b56c
...
@@ -5,7 +5,7 @@ import { s__, sprintf } from '~/locale';
...
@@ -5,7 +5,7 @@ import { s__, sprintf } from '~/locale';
export
default
{
export
default
{
components
:
{
components
:
{
GlModal
GlModal
,
},
},
props
:
{
props
:
{
deleteWikiUrl
:
{
deleteWikiUrl
:
{
...
@@ -26,29 +26,24 @@ export default {
...
@@ -26,29 +26,24 @@ export default {
},
},
computed
:
{
computed
:
{
message
()
{
message
()
{
return
sprintf
(
s__
(
'
WikiPageConfirmDelete|Delete %{pageTitle}
'
),
return
s__
(
'
WikiPageConfirmDelete|Are you sure you want to delete this page?
'
);
{
pageTitle
:
_
.
escape
(
this
.
pageTitle
),
},
false
,
);
},
},
title
()
{
title
()
{
return
sprintf
(
s__
(
'
WikiPageConfirmDelete|Delete Page %{pageTitle}?
'
),
return
sprintf
(
s__
(
'
WikiPageConfirmDelete|Delete Page %{pageTitle}?
'
),
{
{
pageTitle
:
`'
${
_
.
escape
(
this
.
pageTitle
)}
'`
,
pageTitle
:
`'
${
_
.
escape
(
this
.
pageTitle
)}
'`
,
},
},
false
,
false
);
);
}
}
,
},
},
methods
:
{
methods
:
{
onSubmit
()
{
onSubmit
()
{
this
.
$refs
.
form
.
submit
();
this
.
$refs
.
form
.
submit
();
}
}
,
}
}
,
}
}
;
</
script
>
</
script
>
<
template
>
<
template
>
...
@@ -59,6 +54,7 @@ export default {
...
@@ -59,6 +54,7 @@ export default {
:footer-primary-button-text=
"s__('WikiPageConfirmDelete|Delete Page')"
:footer-primary-button-text=
"s__('WikiPageConfirmDelete|Delete Page')"
@
submit=
"onSubmit"
@
submit=
"onSubmit"
>
>
{{
message
}}
<form
<form
ref=
"form"
ref=
"form"
:action=
"deleteWikiUrl"
:action=
"deleteWikiUrl"
...
@@ -76,32 +72,6 @@ export default {
...
@@ -76,32 +72,6 @@ export default {
name=
"authenticity_token"
name=
"authenticity_token"
:value=
"csrfToken"
: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>
</form>
</gl-modal>
</gl-modal>
</
template
>
</
template
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment