diff --git a/akvo/rsr/views/project.py b/akvo/rsr/views/project.py index 1932177463..d70b95a434 100644 --- a/akvo/rsr/views/project.py +++ b/akvo/rsr/views/project.py @@ -461,17 +461,15 @@ def search(request): def partners(request, project_id): """.""" project = get_object_or_404(Project, pk=project_id) - partner_vals = project.all_partners().values() - for partner in partner_vals: + partners = project.all_partners().values() + for partner in partners: id_key = "id".decode('unicode-escape') p = Organisation.objects.get(pk=partner[id_key]) partner['partner_types'] = p.has_partner_types(project) partner['organisation_obj'] = p - partner_types = _get_project_partners(project) context = { 'project': project, - 'partner_vals': partner_vals, - 'partner_types': partner_types + 'partners': partners, } return render(request, 'project_partners.html', context) diff --git a/akvo/templates/project_partners.html b/akvo/templates/project_partners.html index 3dcc49469c..19714b2248 100644 --- a/akvo/templates/project_partners.html +++ b/akvo/templates/project_partners.html @@ -10,7 +10,7 @@

{% trans "Project partners" %}

- {% for partner in partner_vals|dictsort:"name" %} + {% for partner in partners|dictsort:"name" %}
{% img partner.organisation_obj 120 120 partner.name %} @@ -25,12 +25,10 @@

{{ partner.name }}

{% trans "Roles" %}

    {% for type in partner.partner_types %} -
  • {{ type|title }} {% trans "partner" %}
  • - {% if forloop.first %} -
  • {{type|title}} {% trans "partner" %}{% if forloop.last %}.{% else %},{% endif %}
  • - {% else %} -
  • {{type|title}} {% trans "partner" %}
  • - {% endif %} +
  • + {% if forloop.first %}{{type|title}}{% else %}{{type}}{% endif %} + {% trans "partner" %}{% if forloop.last %}.{% else %},{% endif %} +
  • {% endfor %}