haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 01:44:13 +00:00
Code Issues Releases Wiki Activity

Use contact email in user profile page

Browse Source
This commit is contained in:
lian
2016-06-03 12:19:29 +08:00
parent c23bc3802f
commit d346f0962e
6 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
seahub/base/templatetags/seahub_tags.py
View File

@@ -378,6 +378,17 @@ def email2nickname(value):
cache.set(key, nickname, NICKNAME_CACHE_TIMEOUT)
return nickname
@register.filter(name='email2contact_email')
def email2contact_email(value):
"""
Return contact_email if it exists and it's not an empty string,
otherwise return username(login email).
"""
if not value:
return ''
return Profile.objects.get_contact_email_by_user(value)
@register.filter(name='email2id')
def email2id(value):
"""

2
seahub/templates/base.html
View File

@@ -58,7 +58,7 @@
{% avatar request.user 36 %}
<div class="txt">
{{ request.user.username|email2nickname }} <br />
{{ request.user.username}}
{{ request.user.username|email2contact_email}}
</div>
</div>
<span class="loading-icon loading-tip"></span>

2
seahub/templates/js/sysadmin-templates.html
View File

@@ -224,7 +224,7 @@
{% avatar request.user 36 %}
<div class="txt">
<%- app.pageOptions.name %><br />
<%- app.pageOptions.email %>
<%- app.pageOptions.contact_email %>
</div>
</div>
<div class="loading-icon loading-tip"></div>

2
seahub/templates/js/templates.html
View File

@@ -1461,7 +1461,7 @@
{% avatar request.user 36 %}
<div class="txt">
<%- app.pageOptions.name %><br />
<%- app.pageOptions.username %>
<%- app.pageOptions.contact_email %>
</div>
</div>
<div class="loading-icon loading-tip"></div>

1
seahub/templates/libraries.html
View File

@@ -239,6 +239,7 @@ app["pageOptions"] = {
})(),
username: "{{request.user.username}}",
name: "{{request.user.username|email2nickname|escapejs}}",
contact_email: "{{ request.user.username|email2contact_email|escapejs }}",
events_enabled: {% if events_enabled %} true {% else %} false {% endif %},
can_add_repo: {% if user.permissions.can_add_repo %} true {% else %} false {% endif %},
can_generate_shared_link: {% if user.permissions.can_generate_shared_link %} true {% else %} false {% endif %},

3
seahub/templates/sysadmin/sysadmin_backbone.html
View File

@@ -56,7 +56,7 @@
{% avatar request.user 36 %}
<div class="txt">
{{ request.user.username|email2nickname }} <br />
{{ request.user.username}}
{{ request.user.username|email2contact_email }}
</div>
</div>
<span class="loading-icon loading-tip"></span>
@@ -107,6 +107,7 @@ app["pageOptions"] = {
csrfToken: "{{ csrf_token }}",
email: "{{request.user.username}}",
name: "{{request.user.username|email2nickname|escapejs}}",
contact_email: "{{request.user.username|email2contact_email|escapejs}}",
language_code: "{{ LANGUAGE_CODE }}",
events_enabled: {% if events_enabled %} true {% else %} false {% endif %},
repo_password_min_length: {{ repo_password_min_length }},