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
GéoContrib
Géocontrib Frontend
Commits
39ea25ea
Commit
39ea25ea
authored
3 years ago
by
Sébastien DA ROCHA
Browse files
Options
Downloads
Plain Diff
Merge branch 'redmine-issues/12672' into 'develop'
REDMINE_ISSUE-12672
See merge request
!204
parents
096e52db
3e8860aa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!213
2.3.2-rc1
,
!204
REDMINE_ISSUE-12672
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/ImportTask.vue
+2
-1
2 additions, 1 deletion
src/components/ImportTask.vue
src/views/feature_type/Feature_type_detail.vue
+3
-3
3 additions, 3 deletions
src/views/feature_type/Feature_type_detail.vue
with
5 additions
and
4 deletions
src/components/ImportTask.vue
+
2
−
1
View file @
39ea25ea
...
...
@@ -103,7 +103,8 @@ export default {
feature_type
:
this
.
$route
.
params
.
feature_type_slug
});
this
.
$store
.
dispatch
(
'
feature/GET_PROJECT_FEATURES
'
,
{
project_slug
:
this
.
$route
.
params
.
slug
project_slug
:
this
.
$route
.
params
.
slug
,
feature_type__slug
:
this
.
$route
.
params
.
feature_type_slug
})
//* show that the action was triggered, could be improved with animation (doesn't work)
this
.
ready
=
false
;
...
...
This diff is collapsed.
Click to expand it.
src/views/feature_type/Feature_type_detail.vue
+
3
−
3
View file @
39ea25ea
...
...
@@ -298,7 +298,7 @@ export default {
this
.
showImport
=
!
this
.
showImport
;
if
(
this
.
showImport
)
{
this
.
$store
.
dispatch
(
"
feature_type/GET_IMPORTS
"
,
{
feature_type
:
this
.
structure
.
slug
feature_type
:
this
.
$route
.
params
.
feature_type_
slug
});
}
},
...
...
@@ -411,7 +411,7 @@ export default {
const
response
=
await
this
.
$store
.
dispatch
(
'
feature/GET_PROJECT_FEATURES
'
,
{
project_slug
:
this
.
$route
.
params
.
slug
,
feature_type__slug
:
this
.
structure
.
slug
,
feature_type__slug
:
this
.
$route
.
params
.
feature_type_
slug
,
ordering
:
'
-created_on
'
,
limit
:
'
5
'
})
...
...
@@ -425,7 +425,7 @@ export default {
'
structure
'
(
newValue
){
if
(
newValue
.
slug
){
this
.
$store
.
dispatch
(
"
feature_type/GET_IMPORTS
"
,
{
feature_type
:
this
.
structure
.
slug
feature_type
:
this
.
$route
.
params
.
feature_type_
slug
});
}
}
...
...
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