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
489d9d9e
Commit
489d9d9e
authored
Mar 08, 2021
by
Rajat Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show CSV has been exported banner on export
Show alert when requirements csv is being exported
parent
586070ae
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
2 deletions
+28
-2
ee/app/assets/javascripts/requirements/components/export_requirements_modal.vue
...pts/requirements/components/export_requirements_modal.vue
+1
-1
ee/app/assets/javascripts/requirements/components/requirements_root.vue
...javascripts/requirements/components/requirements_root.vue
+22
-1
ee/changelogs/unreleased/show-banner-export.yml
ee/changelogs/unreleased/show-banner-export.yml
+5
-0
No files found.
ee/app/assets/javascripts/requirements/components/export_requirements_modal.vue
View file @
489d9d9e
...
@@ -144,7 +144,7 @@ export default {
...
@@ -144,7 +144,7 @@ export default {
>
{{ __('Select all') }}
</gl-form-checkbox
>
{{ __('Select all') }}
</gl-form-checkbox
>
>
</div>
</div>
<div
class=
"gl-pt-5 gl-pb-4 scrollbox-body"
>
<div
class=
"gl-pt-5 gl-pb-4
gl-pl-6
scrollbox-body"
>
<gl-form-checkbox
<gl-form-checkbox
v-for=
"field in $options.fields"
v-for=
"field in $options.fields"
:key=
"field.key"
:key=
"field.key"
...
...
ee/app/assets/javascripts/requirements/components/requirements_root.vue
View file @
489d9d9e
<
script
>
<
script
>
import
{
GlPagination
}
from
'
@gitlab/ui
'
;
import
{
GlPagination
,
GlAlert
}
from
'
@gitlab/ui
'
;
import
Api
from
'
~/api
'
;
import
Api
from
'
~/api
'
;
import
createFlash
,
{
FLASH_TYPES
}
from
'
~/flash
'
;
import
createFlash
,
{
FLASH_TYPES
}
from
'
~/flash
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
...
@@ -39,6 +39,7 @@ export default {
...
@@ -39,6 +39,7 @@ export default {
AvailableSortOptions
,
AvailableSortOptions
,
components
:
{
components
:
{
GlPagination
,
GlPagination
,
GlAlert
,
FilteredSearchBar
,
FilteredSearchBar
,
RequirementsTabs
,
RequirementsTabs
,
RequirementsLoading
,
RequirementsLoading
,
...
@@ -234,6 +235,7 @@ export default {
...
@@ -234,6 +235,7 @@ export default {
ARCHIVED
:
this
.
initialRequirementsCount
[
FilterState
.
archived
],
ARCHIVED
:
this
.
initialRequirementsCount
[
FilterState
.
archived
],
ALL
:
this
.
initialRequirementsCount
[
FilterState
.
all
],
ALL
:
this
.
initialRequirementsCount
[
FilterState
.
all
],
},
},
alert
:
null
,
};
};
},
},
computed
:
{
computed
:
{
...
@@ -455,6 +457,15 @@ export default {
...
@@ -455,6 +457,15 @@ export default {
selectedFields
,
selectedFields
,
},
},
})
})
.
then
(()
=>
{
this
.
alert
=
{
variant
:
'
info
'
,
message
:
sprintf
(
__
(
'
Your CSV export has started. It will be emailed to %{email} when complete.
'
),
{
email
:
this
.
currentUserEmail
},
),
};
})
.
catch
((
e
)
=>
{
.
catch
((
e
)
=>
{
createFlash
({
createFlash
({
message
:
__
(
'
Something went wrong while exporting requirements
'
),
message
:
__
(
'
Something went wrong while exporting requirements
'
),
...
@@ -675,6 +686,16 @@ export default {
...
@@ -675,6 +686,16 @@ export default {
<
template
>
<
template
>
<div
class=
"requirements-list-container"
>
<div
class=
"requirements-list-container"
>
<gl-alert
v-if=
"alert"
:variant=
"alert.variant"
:dismissible=
"true"
class=
"gl-mt-3 gl-mb-4"
@
dismiss=
"alert = null"
>
{{
alert
.
message
}}
</gl-alert>
<requirements-tabs
<requirements-tabs
:filter-by=
"filterBy"
:filter-by=
"filterBy"
:requirements-count=
"requirementsCount"
:requirements-count=
"requirementsCount"
...
...
ee/changelogs/unreleased/show-banner-export.yml
0 → 100644
View file @
489d9d9e
---
title
:
Show CSV has been exported banner on export
merge_request
:
55965
author
:
type
:
changed
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