Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
AE
Sith
Commits
39119f58
Commit
39119f58
authored
Jun 10, 2018
by
Sli
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sli' into 'master'
Image promo 19 et demande du bdf See merge request
!151
parents
f2106a37
a0a86ef8
Pipeline
#1502
passed with stage
in 6 minutes and 24 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
1 deletion
+2
-1
core/static/core/img/promo_19.png
core/static/core/img/promo_19.png
+0
-0
core/templates/core/user_detail.jinja
core/templates/core/user_detail.jinja
+1
-1
sith/settings.py
sith/settings.py
+1
-0
No files found.
core/static/core/img/promo_19.png
0 → 100644
View file @
39119f58
24.4 KB
core/templates/core/user_detail.jinja
View file @
39119f58
...
...
@@ -111,7 +111,7 @@
</div>
</div>
{%
if
user.memberships.
filter
(
end_date
=
None
)
.
exists
()
or
user.is_in_group
(
settings.SITH_MAIN_BOARD_GROUP
)
or
user
==
profile
%}
{%
if
user.memberships.
filter
(
end_date
=
None
)
.
exists
()
or
user.is_in_group
(
settings.SITH_MAIN_BOARD_GROUP
)
or
user
==
profile
or
user.is_in_group
(
settings.SITH_BAR_MANAGER_BOARD_GROUP
)
%}
{# if the user is member of a club, he can view the subscription state #}
<hr>
{%
if
profile.is_subscribed
%}
...
...
sith/settings.py
View file @
39119f58
...
...
@@ -344,6 +344,7 @@ SITH_MEMBER_SUFFIX = "-membres"
SITH_MAIN_BOARD_GROUP
=
SITH_MAIN_CLUB
[
'unix_name'
]
+
SITH_BOARD_SUFFIX
SITH_MAIN_MEMBERS_GROUP
=
SITH_MAIN_CLUB
[
'unix_name'
]
+
SITH_MEMBER_SUFFIX
SITH_BAR_MANAGER_BOARD_GROUP
=
SITH_BAR_MANAGER
[
'unix_name'
]
+
SITH_BOARD_SUFFIX
SITH_PROFILE_DEPARTMENTS
=
[
(
"TC"
,
_
(
"TC"
)),
...
...
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