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
748ad1c5
Commit
748ad1c5
authored
Sep 21, 2016
by
Sli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some mistakes
parent
2d16b9c2
Pipeline
#236
failed with stage
in 14 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
8 deletions
+1
-8
core/models.py
core/models.py
+1
-6
core/templates/core/user_detail.jinja
core/templates/core/user_detail.jinja
+0
-2
No files found.
core/models.py
View file @
748ad1c5
...
...
@@ -234,12 +234,7 @@ class User(AbstractBaseUser):
@
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
)
return
Club
.
objects
.
filter
(
unix_name
=
'ae'
).
first
().
get_membership_for
(
self
)
def
save
(
self
,
*
args
,
**
kwargs
):
create
=
False
...
...
core/templates/core/user_detail.jinja
View file @
748ad1c5
...
...
@@ -59,8 +59,6 @@
{%
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 #}
...
...
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