Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions handlers/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,8 @@ def get(self, shake_id=None):
else:
category_shakes = []
managers = shake.managers()
# make sure to exclude the owner, just in case they are also in the manager list
managers = [m for m in managers if m.id != shake.user_id]

return self.render(
"admin/group-shake-view.html",
Expand Down
4 changes: 4 additions & 0 deletions templates/admin/group-shake-view.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,13 @@ <h1 class="shake-view-title">{{shake.display_name()}}</h1>
<div class="field" style="align-items: start;">
<label>Managers:</label>
<div class="field-input">
{% if managers %}
{% for manager in managers %}
<a class="shake-manager-promotion" title="Promote {{ escape(manager.display_name()) }}" href="#" data-value="{{ manager.id }}"><img align="left" style="margin: 5px" class="avatar--img" src="{{manager.profile_image_url()}}" width="48" height="48" alt="{{ escape(manager.display_name()) }}"></a>
{% end %}
{% else %}
<p>None</p>
{% end %}
</div>
</div>

Expand Down
11 changes: 8 additions & 3 deletions templates/shakes/_sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,12 @@ <h3>Followed by <span class="count">({{follower_count}})</span></h3>
</div>
</div>




{% if current_user_obj and current_user_obj.is_admin() and not site_is_readonly and shake.type == 'group' %}
<div>
<h3>Admin Actions</h3>
<div class="admin-actions">
<a href="/admin/group-shake/{{shake.id}}">Manage Shake</a>
</div>
</div>
{% end %}
</div>