Skip to content

Commit

Permalink
[#4031] Use group type when building URLs in templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@amercader
amercader committed Feb 23, 2018
1 parent 1876c3c commit da39999
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 41 deletions.
12 changes: 6 additions & 6 deletions ckan/templates/group/edit_base.html
View file
Expand Up @@ -7,20 +7,20 @@
{% set group = c.group_dict %}

{% block breadcrumb_content %}
<li>{% link_for _('Groups'), controller='group', action='index' %}</li>
<li>{% link_for _('Groups'), controller='group', action='index', named_route=group_type + '_index' %}</li>
{% block breadcrumb_content_inner %}
<li>{% link_for h.get_translated(group, 'title') or group.display_name |truncate(35), controller='group', action='read', id=group.name %}</li>
<li class="active">{% link_for _('Manage'), controller='group', action='edit', id=group.name %}</li>
<li>{% link_for h.get_translated(group, 'title') or group.display_name |truncate(35), controller='group', action='read', id=group.name, named_route=group_type + '_read' %}</li>
<li class="active">{% link_for _('Manage'), controller='group', action='edit', id=group.name, named_route=group_type + '_edit' %}</li>
{% endblock %}
{% endblock %}

{% block content_action %}
{% link_for _('View'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye' %}
{% link_for _('View'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye', named_route=group_type + '_read' %}
{% endblock %}

{% block content_primary_nav %}
{{ h.build_nav_icon('group_edit', _('Edit'), id=c.group_dict.name) }}
{{ h.build_nav_icon('group_members', _('Members'), id=c.group_dict.name) }}
{{ h.build_nav_icon(group_type + '_edit', _('Edit'), id=c.group_dict.name) }}
{{ h.build_nav_icon(group_type + '_members', _('Members'), id=c.group_dict.name) }}
{% endblock %}

{% block secondary_content %}
Expand Down
4 changes: 2 additions & 2 deletions ckan/templates/group/index.html
View file
Expand Up @@ -3,14 +3,14 @@
{% block subtitle %}{{ _('Groups') }}{% endblock %}

{% block breadcrumb_content %}
<li class="active">{% link_for _('Groups'), controller='group', action='index' %}</li>
<li class="active">{% link_for _('Groups'), controller='group', action='index', named_route=group_type + '_index' %}</li>
{% endblock %}

{% block page_header %}{% endblock %}

{% block page_primary_action %}
{% if h.check_access('group_create') %}
{% link_for _('Add Group'), controller='group', action='new', class_='btn btn-primary', icon='plus-square' %}
{% link_for _('Add Group'), controller='group', action='new', class_='btn btn-primary', icon='plus-square', named_route=group_type + '_new' %}
{% endif %}
{% endblock %}

Expand Down
4 changes: 2 additions & 2 deletions ckan/templates/group/member_new.html
View file
Expand Up @@ -5,7 +5,7 @@
{% set user = c.user_dict %}

{% block primary_content_inner %}
{% link_for _('Back to all members'), controller='group', action='members', id=group.name, class_='btn pull-right', icon='arrow-left' %}
{% link_for _('Back to all members'), controller='group', action='members', id=group.name, class_='btn pull-right', icon='arrow-left', named_route=group_type + '_members' %}
<h1 class="page-heading">
{% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
</h1>
Expand Down Expand Up @@ -55,7 +55,7 @@ <h1 class="page-heading">
{{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
<div class="form-actions">
{% if user %}
<a href="{% url_for controller='group', action='member_delete', id=c.group_dict.id, user=user.id %}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
<a href="{{ h.url_for(group_type + '_member_delete', id=c.group_dict.id, user=user_id) }}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Save') }}
</button>
Expand Down
6 changes: 3 additions & 3 deletions ckan/templates/group/members.html
View file
Expand Up @@ -3,7 +3,7 @@
{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %}

{% block page_primary_action %}
{% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn btn-primary', icon='plus-square' %}
{% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn btn-primary', icon='plus-square', named_route=group_type + '_member_new' %}
{% endblock %}

{% block primary_content_inner %}
Expand All @@ -25,10 +25,10 @@ <h3 class="page-heading">{{ _('{0} members'.format(c.members|length)) }}</h3>
<td>{{ role }}</td>
<td>
<div class="btn-group pull-right">
<a class="btn btn-small" href="{% url_for controller='group', action='member_new', id=c.group_dict.id, user=user_id %}" title="{{ _('Edit') }}">
<a class="btn btn-small" href="{% url_for controller='group', action='member_delete', id=c.group_dict.id, user=user_id %}" title="{{ _('Edit') }}">
<i class="fa fa-wrench"></i>
</a>
<a class="btn btn-danger btn-small" href="{% url_for controller='group', action='member_delete', id=c.group_dict.id, user=user_id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
<a class="btn btn-danger btn-small" href="{{ h.url_for(group_type + '_member_delete', id=c.group_dict.id, user=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
</div>
</td>
</tr>
Expand Down
12 changes: 6 additions & 6 deletions ckan/templates/group/read_base.html
View file
Expand Up @@ -3,20 +3,20 @@
{% block subtitle %}{{ h.get_translated(c.group_dict, 'title') or c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %}

{% block breadcrumb_content %}
<li>{% link_for _('Groups'), controller='group', action='index' %}</li>
<li class="active">{% link_for h.get_translated(c.group_dict, 'title') or c.group_dict.display_name |truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
<li>{% link_for _('Groups'), controller='group', action='index', named_route=group_type + '_index' %}</li>
<li class="active">{% link_for h.get_translated(c.group_dict, 'title') or c.group_dict.display_name |truncate(35), controller='group', action='read', id=c.group_dict.name, named_route=group_type + '_read' %}</li>
{% endblock %}

{% block content_action %}
{% if h.check_access('group_update', {'id': c.group_dict.id}) %}
{% link_for _('Manage'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
{% link_for _('Manage'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench', named_route=group_type + '_edit' %}
{% endif %}
{% endblock %}

{% block content_primary_nav %}
{{ h.build_nav_icon('group_read', _('Datasets'), id=c.group_dict.name) }}
{{ h.build_nav_icon('group_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }}
{{ h.build_nav_icon('group_about', _('About'), id=c.group_dict.name) }}
{{ h.build_nav_icon(group_type + '_read', _('Datasets'), id=c.group_dict.name) }}
{{ h.build_nav_icon(group_type + '_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }}
{{ h.build_nav_icon(group_type + '_about', _('About'), id=c.group_dict.name) }}
{% endblock %}

{% block secondary_content %}
Expand Down
14 changes: 7 additions & 7 deletions ckan/templates/organization/edit_base.html
View file
Expand Up @@ -5,23 +5,23 @@
{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Organizations') }}{% endblock %}

{% block breadcrumb_content %}
<li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
<li>{% link_for _('Organizations'), controller='organization', action='index', named_route=group_type + '_index' %}</li>
{% block breadcrumb_content_inner %}
<li>{% link_for organization.display_name|truncate(35), controller='organization', action='read', id=organization.name %}</li>
<li class="active">{% link_for _('Manage'), controller='organization', action='edit', id=organization.name %}</li>
<li>{% link_for organization.display_name|truncate(35), controller='organization', action='read', id=organization.name, named_route=group_type + '_read' %}</li>
<li class="active">{% link_for _('Manage'), controller='organization', action='edit', id=organization.name, named_route=group_type + '_edit' %}</li>
{% endblock %}
{% endblock %}

{% block content_action %}
{% if organization and h.check_access('organization_update', {'id': organization.id}) %}
{% link_for _('View'), controller='organization', action='read', id=organization.name, class_='btn', icon='eye' %}
{% link_for _('View'), controller='organization', action='read', id=organization.name, class_='btn', icon='eye', named_route=group_type + '_read' %}
{% endif %}
{% endblock %}

{% block content_primary_nav %}
{{ 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) }}
{{ h.build_nav_icon(group_type + '_edit', _('Edit'), id=c.group_dict.name) }}
{{ h.build_nav_icon(group_type + '_bulk_process', _('Datasets'), id=c.group_dict.name) }}
{{ h.build_nav_icon(group_type + '_members', _('Members'), id=c.group_dict.name) }}
{% endblock %}

{% block secondary_content %}
Expand Down
4 changes: 2 additions & 2 deletions ckan/templates/organization/index.html
View file
Expand Up @@ -3,14 +3,14 @@
{% block subtitle %}{{ _('Organizations') }}{% endblock %}

{% block breadcrumb_content %}
<li class="active">{% link_for _('Organizations'), controller='organization', action='index' %}</li>
<li class="active">{% link_for _('Organizations'), controller='organization', action='index', named_route=group_type + '_index' %}</li>
{% endblock %}

{% block page_header %}{% endblock %}

{% block page_primary_action %}
{% if h.check_access('organization_create') %}
{% link_for _('Add Organization'), controller='organization', action='new', class_='btn btn-primary', icon='plus-square' %}
{% link_for _('Add Organization'), controller='organization', action='new', class_='btn btn-primary', icon='plus-square', named_route=group_type + '_new' %}
{% endif %}
{% endblock %}

Expand Down
4 changes: 2 additions & 2 deletions ckan/templates/organization/member_new.html
View file
Expand Up @@ -7,7 +7,7 @@
{% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} - {{ super() }}{% endblock %}

{% block primary_content_inner %}
{% link_for _('Back to all members'), controller='organization', action='members', id=organization.name, class_='btn pull-right', icon='arrow-left' %}
{% link_for _('Back to all members'), controller='organization', action='members', id=organization.name, class_='btn pull-right', icon='arrow-left', named_route=group_type + '_members' %}
<h1 class="page-heading">
{% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
</h1>
Expand Down Expand Up @@ -56,7 +56,7 @@ <h1 class="page-heading">
{{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
<div class="form-actions">
{% if user %}
<a href="{% url_for controller='organization', action='member_delete', id=c.group_dict.id, user=user.id %}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
<a href="{{ h.url_for(group_type + '_member_delete', id=c.group_dict.id, user=user_id) }}" class="btn btn-danger pull-left" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}">{{ _('Delete') }}</a>
<button class="btn btn-primary" type="submit" name="submit" >
{{ _('Update Member') }}
</button>
Expand Down
6 changes: 3 additions & 3 deletions ckan/templates/organization/members.html
View file
Expand Up @@ -5,7 +5,7 @@
{% block page_primary_action %}
{% if h.check_access('organization_update', {'id': organization.id}) %}

{% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary', icon='plus-square' %}
{% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary', icon='plus-square', named_route=group_type + '_member_new' %}
{% endif %}
{% endblock %}

Expand All @@ -30,10 +30,10 @@ <h3 class="page-heading">{{ members_count }}</h3>
<td>{{ role }}</td>
<td>
<div class="btn-group pull-right">
<a class="btn btn-small" href="{% url_for controller='organization', action='member_new', id=c.group_dict.id, user=user_id %}" title="{{ _('Edit') }}">
<a class="btn btn-small" href="{{ h.url_for(group_type + '_member_new', id=c.group_dict.id, user=user_id) }}" title="{{ _('Edit') }}">
<i class="fa fa-wrench"></i>
</a>
<a class="btn btn-danger btn-small" href="{% url_for controller='organization', action='member_delete', id=c.group_dict.id, user=user_id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
<a class="btn btn-danger btn-small" href="{{ h.url_for(group_type + '_member_delete', id=c.group_dict.id, user=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
</div>
</td>
</tr>
Expand Down
14 changes: 7 additions & 7 deletions ckan/templates/organization/read_base.html
View file
Expand Up @@ -3,24 +3,24 @@
{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Organizations') }}{% endblock %}

{% block breadcrumb_content %}
<li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
<li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}</li>
<li>{% link_for _('Organizations'), controller='organization', action='index', named_route=group_type + '_index' %}</li>
<li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name, named_route=group_type + '_read' %}</li>
{% endblock %}

{% block content_action %}
{% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
{% link_for _('Manage'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
{% link_for _('Manage'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench', named_route=group_type + '_edit' %}
{% endif %}
{% endblock %}

{% block content_primary_nav %}
{{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }}
{{ h.build_nav_icon('organization_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }}
{{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }}
{{ h.build_nav_icon(group_type + '_read', _('Datasets'), id=c.group_dict.name) }}
{{ h.build_nav_icon(group_type + '_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }}
{{ h.build_nav_icon(group_type + '_about', _('About'), id=c.group_dict.name) }}
{% endblock %}

{% block secondary_content %}
{% snippet 'snippets/organization.html', organization=c.group_dict, show_nums=true %}
{% snippet 'snippets/organization.html', organization=c.group_dict, show_nums=true, group_type=group_type %}
{% block organization_facets %}{% endblock %}
{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/snippets/organization.html
View file
Expand Up @@ -15,7 +15,7 @@
#}

{% set truncate = truncate or 0 %}
{% set url = h.url_for(controller='organization', action='read', id=organization.name) %}
{% set url = h.url_for(organization.type + '_read', id=organization.name, ) %}

{% block info %}
<div class="module module-narrow module-shallow context-info">
Expand Down

0 comments on commit da39999

Please sign in to comment.