Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
synnefo
Commits
1fefe48c
Commit
1fefe48c
authored
Feb 06, 2012
by
Sofia Papagiannaki
Browse files
change word `consumed` in `used`
parent
2cbaacd5
Changes
4
Hide whitespace changes
Inline
Side-by-side
astakos/im/admin/templates/admin.html
View file @
1fefe48c
...
...
@@ -3,6 +3,6 @@
{% block body %}
<ul
class=
"unstyled"
>
<li><strong>
{{ stats.users }}
</strong>
User{{ stats.users|pluralize }} (
<strong>
{{ stats.pending }}
</strong>
pending)
</li>
<li><strong>
{{ stats.invitations }}
</strong>
Invitation{{ stats.invitations|pluralize }} sent (
<strong>
{{ stats.invitations_consumed }}
</strong>
consum
ed)
</li>
<li><strong>
{{ stats.invitations }}
</strong>
Invitation{{ stats.invitations|pluralize }} sent (
<strong>
{{ stats.invitations_consumed }}
</strong>
us
ed)
</li>
</ul>
{% endblock body %}
astakos/im/admin/templates/invitations_list.html
View file @
1fefe48c
...
...
@@ -23,7 +23,7 @@
<th>
Code
</th>
<th>
Inviter email
</th>
<th>
Inviter Real Name
</th>
<th>
Is
consum
ed
</th>
<th>
Is
us
ed
?
</th>
<th>
Created
</th>
<th>
Consumed
</th>
</tr>
...
...
astakos/im/templates/im/invitations.html
View file @
1fefe48c
...
...
@@ -12,12 +12,12 @@
<tr>
<th>
Email
</th>
<th>
Real Name
</th>
<th>
Consum
ed
</th>
<th>
Us
ed
</th>
</tr>
</thead>
<tbody>
{% for inv in sent %}
<tr
class=
"{% if inv.is_consumed %}
consum
ed{% endif %}"
>
<tr
class=
"{% if inv.is_consumed %}
us
ed{% endif %}"
>
<td>
{{ inv.email }}
</td>
<td>
{{ inv.realname }}
</td>
<td
class=
"consumed"
>
{% if inv.is_consumed %}Yes{% else %}No{% endif %}
</td>
...
...
astakos/im/util.py
View file @
1fefe48c
...
...
@@ -116,7 +116,7 @@ def get_invitation(request):
return
invitation
=
Invitation
.
objects
.
get
(
code
=
code
)
if
invitation
.
is_consumed
:
raise
ValueError
(
_
(
'Invitation is
consum
ed'
))
raise
ValueError
(
_
(
'Invitation is
us
ed'
))
try
:
AstakosUser
.
objects
.
get
(
email
=
invitation
.
username
)
raise
ValueError
(
_
(
'Email: %s is reserved'
%
invitation
.
username
))
...
...
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