[#2939] fixes to org members template

ckan · Oct 14, 2012 · cb7d3d1 · cb7d3d1
1 parent 1820a02
commit cb7d3d1
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/ckan/templates/organization/members.html b/ckan/templates/organization/members.html
@@ -8,11 +8,9 @@
 {% endblock %}
 
 {% block actions_content %}
-  {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
-    <li>{% link_for _('Add Dataset to Organization'), controller='package', action='new', group=c.group_dict.id, class_='btn', icon='plus' %}</li>
-    <li>{% link_for _('Edit'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='cog' %}</li>
+  {% if h.check_access('organization_member_create', {'id': c.group_dict.id}) %}
+    <li>{% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn', icon='plus' %}</li>
   {% endif %}
-  {# <li>{% link_for _('History'), controller='organization', action='history', id=c.group_dict.name, class_='btn', icon='undo' %}</li> #}
 {% endblock %}
 
 {% block primary_content %}
@@ -21,7 +19,13 @@
       <h1 class="page-heading">{{ _('Members') }}</h1>
       <table class="table table-bordered">
         {% for user_id, user, role in c.members %}
-        <tr><td class="media">{{ h.linked_user(user_id, maxlength=20) }}</td><td>{{ role }}</td></tr>
+        <tr>
+          <td class="media">{{ h.linked_user(user_id, maxlength=20) }}</td>
+          <td>{{ role }}</td>
+          <td>{% link_for _('Edit'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn', user=user_id %}</td>
+          {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
+          <td><a class="btn btn-danger" href="{% url_for controller='organization', action='member_delete', id=c.group_dict.id, user=user_id %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a></td>
+        </tr>
         {% endfor %}
       </table>
     </div>