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
06798fd6
Commit
06798fd6
authored
3 years ago
by
Sébastien DA ROCHA
Browse files
Options
Downloads
Plain Diff
Merge branch 'redmine-issue/11932' into 'develop'
REDMINE_ISSUE-11932
See merge request
!86
parents
26182477
023f7707
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/App.vue
+1
-1
1 addition, 1 deletion
src/App.vue
src/views/project/Project_detail.vue
+10
-2
10 additions, 2 deletions
src/views/project/Project_detail.vue
with
11 additions
and
3 deletions
src/App.vue
+
1
−
1
View file @
06798fd6
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
{{
userFullname
||
user
.
username
||
"
Utilisateur inconnu
"
}}
{{
userFullname
||
user
.
username
||
"
Utilisateur inconnu
"
}}
</router-link>
</router-link>
<div
<div
v-if=
"user
&&
user.is_administrator"
v-if=
"user
||
user.is_administrator"
class=
"item ui label vertical no-hover"
class=
"item ui label vertical no-hover"
>
>
<span
v-if=
"USER_LEVEL_PROJECTS && project"
>
<span
v-if=
"USER_LEVEL_PROJECTS && project"
>
...
...
This diff is collapsed.
Click to expand it.
src/views/project/Project_detail.vue
+
10
−
2
View file @
06798fd6
...
@@ -86,6 +86,7 @@
...
@@ -86,6 +86,7 @@
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"seven wide column"
>
<div
class=
"seven wide column"
>
<h3
class=
"ui header"
>
Types de signalements
</h3>
<div
class=
"ui middle aligned divided list"
>
<div
class=
"ui middle aligned divided list"
>
<div
<div
v-for=
"(type, index) in feature_types"
v-for=
"(type, index) in feature_types"
...
@@ -153,7 +154,9 @@
...
@@ -153,7 +154,9 @@
params: { slug_type_signal: type.slug },
params: { slug_type_signal: type.slug },
}"
}"
v-if="
v-if="
project
&&
permissions
&&
permissions.can_create_feature
project
&&
permissions
&&
permissions.can_create_feature_type
"
"
class="
class="
ui
ui
...
@@ -175,7 +178,12 @@
...
@@ -175,7 +178,12 @@
name: 'editer-type-signalement',
name: 'editer-type-signalement',
params: { slug_type_signal: type.slug },
params: { slug_type_signal: type.slug },
}"
}"
v-if="project
&&
type.is_editable"
v-if="
project
&&
type.is_editable
&&
permissions
&&
permissions.can_create_feature_type
"
class="
class="
ui
ui
compact
compact
...
...
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