Download as
Browse Code »

Commit 30b0b790d7513b6b5cbfc323a6854a29013a2841

Authored by Sergio Oliveira
1 parent ac7e5779
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Allowing superusers to edit other profiles

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
src/accounts/templates/accounts/user_detail.html
  Diff comments   View file @30b0b79
... ... @@ -19,9 +19,9 @@
19 19 <em>{{ user_.username }}</em>
20 20 </h1>
21 21  
22   - {% ifequal request.user user_ %}
23   - <a class="btn btn-info" href="{% url 'user_profile_update' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "update your profile"|title %}</a>
24   - {% endifequal %}
  22 + {% if request.user == user_ or request.user.is_superuser %}
  23 + <a class="btn btn-info" href="{% url 'user_profile_update' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "edit profile"|title %}</a>
  24 + {% endif %}
25 25  
26 26 <div class="divider"></div>
27 27 {% if request.user.is_active %}
... ...
src/accounts/templates/accounts/user_update_form.html
  Diff comments   View file @30b0b79
... ... @@ -70,7 +70,7 @@ $(function() {
70 70  
71 71 <div class="col-lg-12">
72 72 <a href="https://gravatar.com" target="_blank">
73   - {% gravatar request.user.email 50 %}
  73 + {% gravatar user_.email 50 %}
74 74 {% trans "Change your avatar at Gravatar.com" %}
75 75 </a>
76 76 </div>
... ...
src/accounts/views.py
  Diff comments   View file @30b0b79
... ... @@ -33,7 +33,7 @@ class UserProfileUpdateView(UserProfileBaseMixin, UpdateView):
33 33  
34 34 def get_object(self, *args, **kwargs):
35 35 obj = super(UserProfileUpdateView, self).get_object(*args, **kwargs)
36   - if self.request.user != obj:
  36 + if self.request.user != obj and not self.request.user.is_superuser:
37 37 raise PermissionDenied
38 38  
39 39 return obj
... ...