[#585] Makes org edit page header correct

ckan · Mar 7, 2013 · fca3786 · fca3786
1 parent 6c80bdd
commit fca3786
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/ckan/config/routing.py b/ckan/config/routing.py
@@ -301,14 +301,11 @@ def make_map():
         m.connect('/organization/new', action='new')
         m.connect('/organization/{action}/{id}',
           requirements=dict(action='|'.join([
-          'edit',
           'delete',
           'admins',
-          'members',
           'member_new',
           'member_delete',
-          'history',
-          'bulk_process'
+          'history'
           ]))
           )
         m.connect('organization_activity', '/organization/activity/{id}',
@@ -318,6 +315,12 @@ def make_map():
                   action='about', ckan_icon='info-sign')
         m.connect('organization_read', '/organization/{id}', action='read',
                   ckan_icon='sitemap')
+        m.connect('organization_edit', '/organization/edit/{id}',
+                  action='edit', ckan_icon='edit')
+        m.connect('organization_members', '/organization/members/{id}',
+                  action='members', ckan_icon='group')
+        m.connect('organization_bulk_process', '/organization/bulk_process/{id}',
+                  action='bulk_process', ckan_icon='sitemap')
     register_package_plugins(map)
     register_group_plugins(map)
 

diff --git a/ckan/templates/organization/edit_base.html b/ckan/templates/organization/edit_base.html
@@ -23,20 +23,14 @@
 
 {% block primary_content %}
   <section class="module">
-    {% block primary_content_header %}
+    {% block page_header %}
       <header class="module-content page-header">
         <ul class="nav nav-tabs">
-          <li{% if c.action == 'edit' %} class="active"{% endif %}>
-            {% link_for _('Edit'), controller='organization', action='edit', id=organization.name, icon='edit' %}
-          </li>
-          <li{% if c.action == 'bulk_process' %} class="active"{% endif %}>
-            {% link_for _('Datasets'), controller='organization', action='bulk_process', id=organization.name, icon='sitemap' %}
-          </li>
-          {% if h.check_access('organization_member_create', {'id': organization.id}) %}
-          <li{% if c.action == 'members' or c.action =='member_new' %} class="active"{% endif %}>
-            {% link_for _('Members'), controller='organization', action='members', id=organization.name, icon='group' %}
-          </li>
-          {% endif %}
+          {% block page_header_tabs %}
+            {{ h.build_nav_icon('organization_edit', _('Edit'), id=c.group_dict.name) }}
+            {{ h.build_nav_icon('organization_bulk_process', _('Datasets'), id=c.group_dict.name) }}
+            {{ h.build_nav_icon('organization_members', _('Members'), id=c.group_dict.name) }}
+          {% endblock %}
         </ul>
       </header>
     {% endblock %}