diff --git a/seahub/contacts/templates/contacts/contact_list.html b/seahub/contacts/templates/contacts/contact_list.html index ed5f7bffb5..022341ee6d 100644 --- a/seahub/contacts/templates/contacts/contact_list.html +++ b/seahub/contacts/templates/contacts/contact_list.html @@ -22,7 +22,7 @@ {% for contact in contacts %} {% avatar contact.contact_email 20 %} - {{ contact.contact_email }} + {{ contact.contact_email }} {{ contact.profile.nickname }} {{ contact.note }} diff --git a/seahub/group/templates/group/discussion_list.html b/seahub/group/templates/group/discussion_list.html index 577567e200..c9a5e21873 100644 --- a/seahub/group/templates/group/discussion_list.html +++ b/seahub/group/templates/group/discussion_list.html @@ -4,10 +4,10 @@ {# for file/dir 'discuss to grp' #} {% for msg in messages %}
  • -{% avatar msg.from_email 48 %} +{% avatar msg.from_email 48 %}
    - {{ msg.from_email|email2nickname }} + {{ msg.from_email|email2nickname }} {{ msg.timestamp|translate_seahub_time }}

    {{ msg.message|seahub_urlize|find_at|linebreaksbr }}

    @@ -23,7 +23,7 @@
      {% for r in msg.replies %}
    • - {% with id=r.from_email|id_or_email name=r.from_email|email2nickname %} + {% with id=r.from_email name=r.from_email|email2nickname %} {% avatar r.from_email 28 %}
      {{ name }} diff --git a/seahub/group/templates/group/group_discuss.html b/seahub/group/templates/group/group_discuss.html index 1ef65e09e9..16c39af3db 100644 --- a/seahub/group/templates/group/group_discuss.html +++ b/seahub/group/templates/group/group_discuss.html @@ -37,14 +37,14 @@
        {% for msg in group_msgs.object_list %}
      • - {% avatar msg.from_email 48 %} + {% avatar msg.from_email 48 %}
        {% if is_staff or msg.from_email == request.user.username %} {% trans "Delete" %} {% endif %} - {{ msg.from_email|email2nickname }} + {{ msg.from_email|email2nickname }} {{ msg.timestamp|translate_seahub_time }}

        {{ msg.message|seahub_urlize|find_at|linebreaksbr }}

        @@ -92,7 +92,7 @@
          {% for r in msg.replies %}
        • - {% with id=r.from_email|id_or_email name=r.from_email|email2nickname %} + {% with id=r.from_email name=r.from_email|email2nickname %} {% avatar r.from_email 28 %}
          {{ name }} @@ -145,12 +145,12 @@ {% if request.user.is_authenticated %}
          • - {% avatar request.user.username 48 %} + {% avatar request.user.username 48 %}
            {% trans "Delete" %} - {{ request.user.username|email2nickname }} + {{ request.user.username|email2nickname }} {% trans "Just now" %}
            diff --git a/seahub/group/templates/group/group_members.html b/seahub/group/templates/group/group_members.html index 967b24d33c..42c9b05274 100644 --- a/seahub/group/templates/group/group_members.html +++ b/seahub/group/templates/group/group_members.html @@ -12,7 +12,7 @@
              {% for m in members %} - {% with e=m.user_name id=m.user_name|id_or_email %} + {% with e=m.user_name id=m.user_name %}
            • {% avatar e 48 %}
              diff --git a/seahub/group/templates/group/group_reply_list.html b/seahub/group/templates/group/group_reply_list.html index b71447367e..c1c73174ee 100644 --- a/seahub/group/templates/group/group_reply_list.html +++ b/seahub/group/templates/group/group_reply_list.html @@ -2,7 +2,7 @@ {% load url from future %} {% for r in replies %} -{% with id=r.from_email|id_or_email name=r.from_email|email2nickname %} +{% with id=r.from_email name=r.from_email|email2nickname %}
            • {% avatar r.from_email 28 %}
              diff --git a/seahub/group/templates/group/new_msg_reply.html b/seahub/group/templates/group/new_msg_reply.html index 75408e2612..09824b9de4 100644 --- a/seahub/group/templates/group/new_msg_reply.html +++ b/seahub/group/templates/group/new_msg_reply.html @@ -8,12 +8,12 @@ {% for msg in group_msgs %}
            • - {% avatar msg.from_email 48 %} + {% avatar msg.from_email 48 %}
              - {{ msg.from_email|email2nickname }} + {{ msg.from_email|email2nickname }} {{ msg.timestamp|translate_seahub_time }} {% trans "Group: " %}{{ msg.group_name }}
              @@ -51,9 +51,9 @@
                {% for r in msg.replies %}
              • - {% avatar r.from_email 28 %} + {% avatar r.from_email 28 %}
                - {{ r.from_email|email2nickname }} + {{ r.from_email|email2nickname }} {{ r.timestamp|translate_seahub_time }} {% trans 'Reply' %}

                {{ r.message|seahub_urlize|find_at|linebreaksbr }}

                diff --git a/seahub/message/templates/message/all_msg.html b/seahub/message/templates/message/all_msg.html index 81575f9735..258196ff37 100644 --- a/seahub/message/templates/message/all_msg.html +++ b/seahub/message/templates/message/all_msg.html @@ -2,7 +2,7 @@ {% for key,value in msgs %} {% with not_read=value.not_read %} - + {% avatar key 20 %} {{ key|email2nickname }}{% if not_read > 0%}({{not_read}}){% endif %} {{ value.last_msg|seahub_urlize|truncatewords_html:12 }} diff --git a/seahub/message/templates/message/all_msg_list.html b/seahub/message/templates/message/all_msg_list.html index a5c7379807..b3464888f4 100644 --- a/seahub/message/templates/message/all_msg_list.html +++ b/seahub/message/templates/message/all_msg_list.html @@ -26,7 +26,7 @@ {% if msgs %} {% for key,value in msgs %} {% with not_read=value.not_read %} - + {% avatar key 20 %} {{ key|email2nickname }}{% if not_read > 0%}({{not_read}}){% endif %} {{ value.last_msg|seahub_urlize|truncatewords_html:12 }} diff --git a/seahub/message/templates/message/user_msg.html b/seahub/message/templates/message/user_msg.html index 1908e0712e..c7866c5f35 100644 --- a/seahub/message/templates/message/user_msg.html +++ b/seahub/message/templates/message/user_msg.html @@ -1,12 +1,12 @@ {% load seahub_tags avatar_tags i18n %}
              • - {% avatar msg.from_email 48 %} + {% avatar msg.from_email 48 %}
                {% trans "Delete" %} - {{ msg.from_email|email2nickname }} + {{ msg.from_email|email2nickname }} {{ msg.timestamp|translate_seahub_time }}

                {{ msg.message|seahub_urlize|find_at|linebreaksbr }}

                diff --git a/seahub/message/templates/message/user_msg_list.html b/seahub/message/templates/message/user_msg_list.html index 59d59cef4d..6bbfa6aaff 100644 --- a/seahub/message/templates/message/user_msg_list.html +++ b/seahub/message/templates/message/user_msg_list.html @@ -40,10 +40,10 @@ {% for msg in person_msgs.object_list %} {% if msg.to_email == request.user.email %}
              • - {% avatar msg.from_email 48 %} + {% avatar msg.from_email 48 %} {% else %}
              • - {% avatar msg.from_email 48 %} + {% avatar msg.from_email 48 %} {% endif %}
                @@ -53,7 +53,7 @@ {% else %} {% trans "Delete" %} {% endif %} - {{ msg.from_email|email2nickname }} + {{ msg.from_email|email2nickname }} {{ msg.timestamp|translate_seahub_time }}

                {{ msg.message|seahub_urlize|find_at|linebreaksbr }}

                diff --git a/seahub/profile/urls.py b/seahub/profile/urls.py index a29ba88860..11d1ad6bb9 100644 --- a/seahub/profile/urls.py +++ b/seahub/profile/urls.py @@ -7,6 +7,6 @@ urlpatterns = patterns('seahub.profile.views', url(r'^delete/$', 'delete_user_account', name="delete_user_account"), url(r'^default-repo/$', 'default_repo', name="default_repo"), - url(r'^(?P[^/]+)/$', 'user_profile', name="user_profile"), + url(r'^(?P[^/]+)/$', 'user_profile', name="user_profile"), # url(r'^logout/$', 'logout_relay', name="logout_relay"), ) diff --git a/seahub/profile/views.py b/seahub/profile/views.py index 73bba496bf..8faea4dbce 100644 --- a/seahub/profile/views.py +++ b/seahub/profile/views.py @@ -83,20 +83,11 @@ def edit_profile(request): }, context_instance=RequestContext(request)) @login_required -def user_profile(request, username_or_id): - # fetch the user by username or id, try id first - user = None +def user_profile(request, username): try: - user_id = int(username_or_id) - try: - user = User.objects.get(id=user_id) - except: - pass - except ValueError: - try: - user = User.objects.get(email=username_or_id) - except User.DoesNotExist: - pass + user = User.objects.get(email=username) + except User.DoesNotExist: + user = None nickname = '' if user is None else email2nickname(user.username) @@ -110,7 +101,6 @@ def user_profile(request, username_or_id): d_profile = None return render_to_response('profile/user_profile.html', { - 'username_or_id': username_or_id, 'user': user, 'nickname': nickname, 'intro': intro, diff --git a/seahub/share/templates/share/user_share_list.html b/seahub/share/templates/share/user_share_list.html index b8284ba986..c693747da8 100644 --- a/seahub/share/templates/share/user_share_list.html +++ b/seahub/share/templates/share/user_share_list.html @@ -21,8 +21,8 @@ {% block right_panel %}
                diff --git a/seahub/share/views.py b/seahub/share/views.py index 6837b932eb..30cd5d54ff 100644 --- a/seahub/share/views.py +++ b/seahub/share/views.py @@ -1179,44 +1179,44 @@ def save_private_file_share(request, token): next = SITE_ROOT return HttpResponseRedirect(next) -@login_required -def user_share_list(request, id_or_email): - """List sharing repos with ``to_email``. - """ - try: - uid = int(id_or_email) - try: - user = User.objects.get(id=uid) - except User.DoesNotExist: - user = None - if not user: - return render_to_response("user_404.html", {}, - context_instance=RequestContext(request)) - to_email = user.email - except ValueError: - to_email = id_or_email +# @login_required +# def user_share_list(request, id_or_email): +# """List sharing repos with ``to_email``. +# """ +# try: +# uid = int(id_or_email) +# try: +# user = User.objects.get(id=uid) +# except User.DoesNotExist: +# user = None +# if not user: +# return render_to_response("user_404.html", {}, +# context_instance=RequestContext(request)) +# to_email = user.email +# except ValueError: +# to_email = id_or_email - share_list = [] - username = request.user.username - share_in = seafile_api.get_share_in_repo_list(username, -1, -1) - for e in share_in: - if e.share_type == 'personal' and e.user == to_email: - e.share_in = True - share_list.append(e) - share_out = seafile_api.get_share_out_repo_list(username, -1, -1) - for e in share_out: - if e.share_type == 'personal' and e.user == to_email: - e.share_out = True - share_list.append(e) +# share_list = [] +# username = request.user.username +# share_in = seafile_api.get_share_in_repo_list(username, -1, -1) +# for e in share_in: +# if e.share_type == 'personal' and e.user == to_email: +# e.share_in = True +# share_list.append(e) +# share_out = seafile_api.get_share_out_repo_list(username, -1, -1) +# for e in share_out: +# if e.share_type == 'personal' and e.user == to_email: +# e.share_out = True +# share_list.append(e) - c = Contact.objects.get_contact_by_user(username, to_email) - add_to_contacts = True if c is None else False +# c = Contact.objects.get_contact_by_user(username, to_email) +# add_to_contacts = True if c is None else False - return render_to_response('share/user_share_list.html', { - 'to_email': to_email, - 'share_list': share_list, - 'add_to_contacts': add_to_contacts, - }, context_instance=RequestContext(request)) +# return render_to_response('share/user_share_list.html', { +# 'to_email': to_email, +# 'share_list': share_list, +# 'add_to_contacts': add_to_contacts, +# }, context_instance=RequestContext(request)) @login_required_ajax def get_shared_upload_link(request): diff --git a/seahub/templates/file_revisions.html b/seahub/templates/file_revisions.html index 057dc74ea4..890a856de4 100644 --- a/seahub/templates/file_revisions.html +++ b/seahub/templates/file_revisions.html @@ -43,7 +43,7 @@ {% if commit.creator_name %} {% avatar commit.creator_name 16 %} - {{ commit.creator_name|email2nickname }} + {{ commit.creator_name|email2nickname }} {% else %} {% trans 'Unknown' %} diff --git a/seahub/templates/pubuser.html b/seahub/templates/pubuser.html index b163ce6d15..ba61aa622b 100644 --- a/seahub/templates/pubuser.html +++ b/seahub/templates/pubuser.html @@ -29,7 +29,7 @@ {% if users %}
                  {% for u in users %} - {% with e=u.email id=u.email|id_or_email %} + {% with e=u.email id=u.email %}
                • {% avatar e 48 %}
                  diff --git a/seahub/templates/repo_history.html b/seahub/templates/repo_history.html index 84b7c53433..ebcf78b61b 100644 --- a/seahub/templates/repo_history.html +++ b/seahub/templates/repo_history.html @@ -34,7 +34,7 @@ {% if commit.creator_name %} {% if not commit.second_parent_id %} {% avatar commit.creator_name 16 %} - {{ commit.creator_name|email2nickname }} + {{ commit.creator_name|email2nickname }} {% else %} {% trans "None"%} {% endif %} diff --git a/seahub/templates/repo_history_view.html b/seahub/templates/repo_history_view.html index 72eb3649be..4156ee54ab 100644 --- a/seahub/templates/repo_history_view.html +++ b/seahub/templates/repo_history_view.html @@ -16,7 +16,7 @@ {% if current_commit.props.creator_name %} {% avatar current_commit.props.creator_name 20 %} - {{ current_commit.props.creator_name|short_email }} + {{ current_commit.props.creator_name|short_email }} {% else %} {% trans "Unknown"%} {% endif %} diff --git a/seahub/templates/repo_view_snapshot.html b/seahub/templates/repo_view_snapshot.html index 2b927f1f01..b307b87ff7 100644 --- a/seahub/templates/repo_view_snapshot.html +++ b/seahub/templates/repo_view_snapshot.html @@ -31,7 +31,7 @@ {% if commit.creator_name %} {% if not commit.second_parent_id %} - {% avatar commit.creator_name 16 %} {{ commit.creator_name|email2nickname }} + {% avatar commit.creator_name 16 %} {{ commit.creator_name|email2nickname }} {% else %} {% trans "None"%} {% endif %} diff --git a/seahub/templates/snippets/current_commit.html b/seahub/templates/snippets/current_commit.html index c4372f8870..5cde50dd48 100644 --- a/seahub/templates/snippets/current_commit.html +++ b/seahub/templates/snippets/current_commit.html @@ -6,7 +6,7 @@ {% if info_commit.props.creator_name %} {% avatar info_commit.props.creator_name 20 %} - {{ info_commit.creator_name|email2nickname }} + {{ info_commit.creator_name|email2nickname }} {% else %} {% trans "Unknown"%} {% endif %} diff --git a/seahub/templates/snippets/events_body.html b/seahub/templates/snippets/events_body.html index 5b217d632a..21eeabb760 100644 --- a/seahub/templates/snippets/events_body.html +++ b/seahub/templates/snippets/events_body.html @@ -33,7 +33,7 @@

                  {% blocktrans with library_name=e.repo_name %}Deleted library {{ library_name }}{% endblocktrans %}

                  {% endif %} -

                  {{ e.author|email2nickname }} {{ e.time|translate_seahub_time }}

                  +

                  {{ e.author|email2nickname }} {{ e.time|translate_seahub_time }}

                  • {% endfor %} diff --git a/seahub/templates/text_diff.html b/seahub/templates/text_diff.html index c9bce26eb6..ca39e7b90b 100644 --- a/seahub/templates/text_diff.html +++ b/seahub/templates/text_diff.html @@ -3,7 +3,7 @@ {% load url from future %} {% block main_panel %} -

                  {{ u_filename }} {% trans "modification details" %} {% avatar current_commit.creator_name 16 %}{{ current_commit.creator_name|email2nickname }}{{ current_commit.ctime|translate_seahub_time }}

                  +

                  {{ u_filename }} {% trans "modification details" %} {% avatar current_commit.creator_name 16 %}{{ current_commit.creator_name|email2nickname }}{{ current_commit.ctime|translate_seahub_time }}

                  diff --git a/seahub/templates/view_file_base.html b/seahub/templates/view_file_base.html index 25dcae0355..9aadf92e7d 100644 --- a/seahub/templates/view_file_base.html +++ b/seahub/templates/view_file_base.html @@ -45,7 +45,7 @@

                  - {% avatar latest_contributor 24 %} {{ latest_contributor|email2nickname }} + {% avatar latest_contributor 24 %} {{ latest_contributor|email2nickname }} {{ last_modified|translate_seahub_time}} {% block update_detail %} {% if last_commit_id %} diff --git a/seahub/urls.py b/seahub/urls.py index a5f947ae27..05c9f993ea 100644 --- a/seahub/urls.py +++ b/seahub/urls.py @@ -13,8 +13,8 @@ from seahub.views.repo import repo, repo_history_view, view_shared_dir, \ from notifications.views import notification_list from group.views import group_list from message.views import user_msg_list, user_msg_remove, user_received_msg_remove -from share.views import user_share_list, gen_private_file_share, \ - rm_private_file_share, save_private_file_share +from share.views import gen_private_file_share, rm_private_file_share, \ + save_private_file_share from seahub.views.wiki import personal_wiki, personal_wiki_pages, \ personal_wiki_create, personal_wiki_page_new, personal_wiki_page_edit, \ personal_wiki_page_delete, personal_wiki_use_lib @@ -119,7 +119,7 @@ urlpatterns = patterns('', url(r'^user/(?P[^/]+)/msgs/$', user_msg_list, name='user_msg_list'), url(r'^user/(?P\d+)/msgdel/$', user_msg_remove, name='user_msg_remove'), url(r'^user/(?P\d+)/remsgdel/$', user_received_msg_remove, name='user_received_msg_remove'), - url(r'^user/(?P[^/]+)/shares/$', user_share_list, name='user_share_list'), + # url(r'^user/(?P[^/]+)/shares/$', user_share_list, name='user_share_list'), url(r'^modules/toggle/$', toggle_modules, name="toggle_modules"), url(r'^download_client_program/$', TemplateView.as_view(template_name="download.html"), name="download_client"), url(r'^choose_register/$', TemplateView.as_view(template_name="choose_register.html"), name="choose_register"), @@ -234,11 +234,11 @@ urlpatterns = patterns('', url(r'^useradmin/remove/(?P[^/]+)/$', user_remove, name="user_remove"), url(r'^useradmin/removetrial/(?P[^/]+)/$', remove_trial, name="remove_trial"), url(r'^useradmin/search/$', user_search, name="user_search"), - url(r'^useradmin/makeadmin/(?P[^/]+)/$', user_make_admin, name='user_make_admin'), +# url(r'^useradmin/makeadmin/(?P[^/]+)/$', user_make_admin, name='user_make_admin'), url(r'^useradmin/removeadmin/(?P[^/]+)/$', user_remove_admin, name='user_remove_admin'), url(r'^useradmin/info/(?P[^/]+)/$', user_info, name='user_info'), - url(r'^useradmin/activate/(?P[^/]+)/$', user_activate, name='user_activate'), - url(r'^useradmin/deactivate/(?P[^/]+)/$', user_deactivate, name='user_deactivate'), +# url(r'^useradmin/activate/(?P[^/]+)/$', user_activate, name='user_activate'), +# url(r'^useradmin/deactivate/(?P[^/]+)/$', user_deactivate, name='user_deactivate'), url(r'^useradmin/toggle_status/(?P[^/]+)/$', user_toggle_status, name='user_toggle_status'), url(r'^useradmin/toggle_role/(?P[^/]+)/$', user_toggle_role, name='user_toggle_role'), url(r'^useradmin/(?P[^/]+)/set_quota/$', user_set_quota, name='user_set_quota'), diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index e9a5a6b7a3..39ed0496d9 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -763,22 +763,22 @@ def remove_trial(request, user_or_org): messages.success(request, _('Successfully remove trial for: %s') % user_or_org) return HttpResponseRedirect(next) -@login_required -@sys_staff_required -def user_make_admin(request, user_id): - """Set user as system admin.""" - try: - user = User.objects.get(id=int(user_id)) - user.is_staff = True - user.save() - messages.success(request, _(u'Successfully set %s as admin') % user.username) - except User.DoesNotExist: - messages.error(request, _(u'Failed to set admin: the user does not exist')) +# @login_required +# @sys_staff_required +# def user_make_admin(request, user_id): +# """Set user as system admin.""" +# try: +# user = User.objects.get(id=int(user_id)) +# user.is_staff = True +# user.save() +# messages.success(request, _(u'Successfully set %s as admin') % user.username) +# except User.DoesNotExist: +# messages.error(request, _(u'Failed to set admin: the user does not exist')) - referer = request.META.get('HTTP_REFERER', None) - next = reverse('sys_useradmin') if referer is None else referer +# referer = request.META.get('HTTP_REFERER', None) +# next = reverse('sys_useradmin') if referer is None else referer - return HttpResponseRedirect(next) +# return HttpResponseRedirect(next) @login_required @sys_staff_required @@ -797,39 +797,39 @@ def user_remove_admin(request, email): return HttpResponseRedirect(next) -@login_required -@sys_staff_required -def user_activate(request, user_id): - try: - user = User.objects.get(id=int(user_id)) - user.is_active = True - user.save() - messages.success(request, _(u'Successfully activated "%s".') % user.email) - except User.DoesNotExist: - messages.success(request, _(u'Failed to activate: user does not exist.')) +# @login_required +# @sys_staff_required +# def user_activate(request, user_id): +# try: +# user = User.objects.get(id=int(user_id)) +# user.is_active = True +# user.save() +# messages.success(request, _(u'Successfully activated "%s".') % user.email) +# except User.DoesNotExist: +# messages.success(request, _(u'Failed to activate: user does not exist.')) - next = request.META.get('HTTP_REFERER', None) - if not next: - next = reverse('sys_useradmin') +# next = request.META.get('HTTP_REFERER', None) +# if not next: +# next = reverse('sys_useradmin') - return HttpResponseRedirect(next) +# return HttpResponseRedirect(next) -@login_required -@sys_staff_required -def user_deactivate(request, user_id): - try: - user = User.objects.get(id=int(user_id)) - user.is_active = False - user.save() - messages.success(request, _(u'Successfully deactivated "%s".') % user.email) - except User.DoesNotExist: - messages.success(request, _(u'Failed to deactivate: user does not exist.')) +# @login_required +# @sys_staff_required +# def user_deactivate(request, user_id): +# try: +# user = User.objects.get(id=int(user_id)) +# user.is_active = False +# user.save() +# messages.success(request, _(u'Successfully deactivated "%s".') % user.email) +# except User.DoesNotExist: +# messages.success(request, _(u'Failed to deactivate: user does not exist.')) - next = request.META.get('HTTP_REFERER', None) - if not next: - next = reverse('sys_useradmin') +# next = request.META.get('HTTP_REFERER', None) +# if not next: +# next = reverse('sys_useradmin') - return HttpResponseRedirect(next) +# return HttpResponseRedirect(next) def email_user_on_activation(user): """Send an email to user when admin activate his/her account.