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
d1d38bce
Commit
d1d38bce
authored
Jun 20, 2018
by
samdbeckham
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds a `.modal--hide-footer` class to the security modal so we can conditionally hide it with CSS
parent
33116299
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
10 deletions
+17
-10
ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue
...ascripts/vue_shared/security_reports/components/modal.vue
+10
-8
ee/app/assets/stylesheets/pages/security_reports.scss
ee/app/assets/stylesheets/pages/security_reports.scss
+5
-0
spec/javascripts/vue_shared/security_reports/components/modal_spec.js
...ipts/vue_shared/security_reports/components/modal_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/vue_shared/security_reports/components/modal.vue
View file @
d1d38bce
...
...
@@ -57,6 +57,7 @@ export default {
<modal
id=
"modal-mrwidget-security-issue"
:header-title-text=
"modal.title"
:class=
"
{'modal--hide-footer': modal.vulnerability.resolved}"
class="modal-security-report-dast"
>
<slot>
...
...
@@ -195,6 +196,7 @@ export default {
</div>
</slot>
<div
slot=
"footer"
>
<
template
v-if=
"!modal.vulnerability.resolved"
>
<button
type=
"button"
class=
"btn btn-default"
...
...
@@ -203,7 +205,6 @@ export default {
{{
__
(
'
Cancel
'
)
}}
</button>
<
template
v-if=
"!modal.vulnerability.resolved"
>
<loading-button
:loading=
"modal.isDismissingIssue"
:disabled=
"modal.isDismissingIssue"
...
...
@@ -221,6 +222,7 @@ export default {
{{
__
(
'
View issue
'
)
}}
</a>
<loading-button
v-else
:loading=
"modal.isCreatingNewIssue"
:disabled=
"modal.isCreatingNewIssue"
:label=
"__('Create issue')"
...
...
ee/app/assets/stylesheets/pages/security_reports.scss
View file @
d1d38bce
...
...
@@ -139,4 +139,9 @@
width
:
$modal-lg
;
max-width
:
$modal-lg
;
}
// This is temporary till we get the new modals hooked up
&
.modal--hide-footer
.modal-footer
{
display
:
none
;
}
}
spec/javascripts/vue_shared/security_reports/components/modal_spec.js
View file @
d1d38bce
...
...
@@ -211,8 +211,8 @@ describe('Security Reports modal', () => {
});
});
it
(
'
does not
render a button to dismiss issue
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-dismiss-btn
'
)).
toBeFals
y
();
it
(
'
does not
display the footer
'
,
()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'
modal--hide-footer
'
)).
toBeTruth
y
();
});
});
});
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