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
2d16b9c2
Commit
2d16b9c2
authored
Sep 21, 2016
by
Sli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hided launderette slots and tokens for non authorized users and added is_office and is_launderette
parent
f1e54439
Pipeline
#235
failed with stage
in 13 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
7 deletions
+19
-7
core/models.py
core/models.py
+10
-0
core/templates/core/user_detail.jinja
core/templates/core/user_detail.jinja
+9
-7
No files found.
core/models.py
View file @
2d16b9c2
...
...
@@ -231,6 +231,16 @@ class User(AbstractBaseUser):
def
is_root
(
self
):
return
self
.
is_superuser
or
self
.
groups
.
filter
(
name
=
settings
.
SITH_GROUPS
[
'root'
][
'name'
]).
exists
()
@
property
def
is_office
(
self
):
from
club.models
import
Club
return
Club
.
objects
.
filter
(
unix_name
=
'laverie'
).
first
().
get_membership_for
(
self
)
@
property
def
is_launderette
(
self
):
from
club.models
import
Club
return
Club
.
objects
.
filter
(
unix_name
=
''
).
first
().
get_membership_for
(
self
)
def
save
(
self
,
*
args
,
**
kwargs
):
create
=
False
with
transaction
.
atomic
():
...
...
core/templates/core/user_detail.jinja
View file @
2d16b9c2
...
...
@@ -56,14 +56,16 @@
{# if the user is member of a club, he can view the subscription state #}
<p>
{%
if
get_subscriber
(
profile
)
.
is_subscribed
()
%}
{%
trans
subscription_end
=
get_subscriber
(
profile
)
.
subscriptions.last
()
.
subscription_end
%}
Subscribed until
{{
subscription_end
}}{%
endtrans
%}
<br/>
{%
if
user
==
profile
or
user.is_root
%}
{%
trans
%}
Account number:
{%
endtrans
%}{{
profile.customer.account_id
}}
<br/>
{%
if
user
==
profile
or
user.is_root
or
user.is_office
%}
{%
trans
subscription_end
=
get_subscriber
(
profile
)
.
subscriptions.last
()
.
subscription_end
%}
Subscribed until
{{
subscription_end
}}{%
endtrans
%}
<br/>
{%
trans
%}
Account number:
{%
endtrans
%}{{
profile.customer.account_id
}}
<br/>
{%
endif
%}
{%
if
user
==
profile
or
user.is_root
or
user.is_office
or
user.is_launderette
%}
{# Shows tokens bought by the user #}
{{
show_tokens
(
profile
)
}}
{# Shows slots took by the user #}
{{
show_slots
(
profile
)
}}
{%
endif
%}
{# Shows tokens bought by the user #}
{{
show_tokens
(
profile
)
}}
{# Shows slots took by the user #}
{{
show_slots
(
profile
)
}}
{%
else
%}
{%
trans
%}
Not subscribed
{%
endtrans
%}
{%
if
user.is_in_group
(
settings.SITH_MAIN_BOARD_GROUP
)
%}
...
...
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