Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Géocontrib Frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
externe Matthieu
Géocontrib Frontend
Commits
9356a798
Commit
9356a798
authored
2 years ago
by
Sébastien DA ROCHA
Browse files
Options
Downloads
Plain Diff
Merge branch 'redmine-issue/13762' into 'develop'
REDMINE_ISSUE-13762
See merge request
!376
parents
eba944d0
0b0c6c6f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Feature/Detail/FeatureHeader.vue
+1
-1
1 addition, 1 deletion
src/components/Feature/Detail/FeatureHeader.vue
src/views/Feature/FeatureDetail.vue
+6
-4
6 additions, 4 deletions
src/views/Feature/FeatureDetail.vue
with
7 additions
and
5 deletions
src/components/Feature/Detail/FeatureHeader.vue
+
1
−
1
View file @
9356a798
...
...
@@ -45,7 +45,7 @@
v-if=
"((permissions && permissions.can_update_feature) || isFeatureCreator) && isOnline"
id=
"currentFeature-delete"
class=
"ui button button-hover-red"
@
click=
"
isCanceling = true
"
@
click=
"
$emit('delete')
"
>
<i
class=
"inverted grey trash alternate icon"
...
...
This diff is collapsed.
Click to expand it.
src/views/Feature/FeatureDetail.vue
+
6
−
4
View file @
9356a798
...
...
@@ -9,7 +9,9 @@
>
<div
class=
"row"
>
<div
class=
"sixteen wide column"
>
<FeatureHeader
/>
<FeatureHeader
@
delete=
"isCanceling = true"
/>
</div>
</div>
<div
class=
"row"
>
...
...
@@ -52,7 +54,7 @@
</div>
<div
v-if=
"isCanceling"
class=
"ui dimmer modals
page
transition visible active"
class=
"ui dimmer modals transition visible active"
style=
"display: flex !important"
>
<div
...
...
@@ -234,9 +236,9 @@ export default {
deleteFeature
()
{
this
.
$store
.
dispatch
(
'
feature/DELETE_FEATURE
'
,
{
feature_id
:
this
.
currentFeature
.
feature_id
})
.
then
((
response
)
=>
{
.
then
(
async
(
response
)
=>
{
if
(
response
.
status
===
204
)
{
this
.
GET_PROJECT_FEATURES
({
await
this
.
GET_PROJECT_FEATURES
({
project_slug
:
this
.
$route
.
params
.
slug
});
this
.
goBackToProject
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment