haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-09 02:42:47 +00:00
Code Issues Releases Wiki Activity

Fix user get bug

Browse Source
This commit is contained in:
xiez
2012-08-15 19:40:28 +08:00
parent 31bc49b464
commit 85d39e2dda
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
base/accounts.py
View File

@@ -36,6 +36,9 @@ class UserManager(object):
return self.get(email=email) return self.get(email=email)
def get(self, email=None, id=None): def get(self, email=None, id=None):
if not email and not id:
raise User.DoesNotExist, 'User matching query does not exits.'
if email: if email:
emailuser = ccnet_threaded_rpc.get_emailuser(email) emailuser = ccnet_threaded_rpc.get_emailuser(email)
if id: if id:

2
organizations/templates/organizations/org_info.html
View File

@@ -9,7 +9,7 @@
{% if org_users %} {% if org_users %}
<ul> <ul>
{% for member in org_users %} {% for member in org_users %}
<li class="org-member">{% avatar member.user_name 16 %}<span class="org-member-name"><a href="{{ SITE_ROOT }}profile/{{ member.email }}/">{{ member.email|email2nickname }}</a></span></li> <li class="org-member">{% avatar member.email 16 %}<span class="org-member-name"><a href="{{ SITE_ROOT }}profile/{{ member.email }}/">{{ member.email|email2nickname }}</a></span></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}