diff --git a/akvo/rest/views/typeahead.py b/akvo/rest/views/typeahead.py index 350d1bd5e3..5ca012844a 100644 --- a/akvo/rest/views/typeahead.py +++ b/akvo/rest/views/typeahead.py @@ -78,7 +78,7 @@ def typeahead_user_projects(request): def typeahead_impact_projects(request): user = request.user projects = Project.objects.all() if user.is_admin or user.is_superuser else user.my_projects() - projects = projects.published().filter(is_impact_project=True, is_public=True).order_by('title') + projects = projects.published().filter(is_impact_project=True).order_by('title') return Response( rejig(projects, TypeaheadProjectSerializer(projects, many=True)) diff --git a/akvo/templates/myrsr/my_projects.html b/akvo/templates/myrsr/my_projects.html index 9fbe56d2d5..a4cfbe0822 100644 --- a/akvo/templates/myrsr/my_projects.html +++ b/akvo/templates/myrsr/my_projects.html @@ -45,7 +45,7 @@ {% for project in page %} - + {% img project 64 64 project.title %} @@ -56,10 +56,10 @@

{% if project.title %}{{ project.title }}{% else %}<

{{ project.subtitle }}

- {% if not project.is_public %} - {% trans 'Private' %} - {% elif not project.is_published %} + {% if not project.is_published %} {% trans 'Unpublished' %} + {% elif not project.is_public %} + {% trans 'Private' %} {% endif %} {% for validation in project.validations.all %}{{ validation.name }}{% if not forloop.last %} + {% endif %}{% endfor %} {% trans 'project' %} @@ -71,14 +71,13 @@

{% if project.title %}{{ project.title }}{% else %}< {% has_perm 'rsr.change_project' user project as can_edit_project %} {% if can_edit_project %}
  • {% trans 'Edit' %}
  • - {% if project.is_impact_project and project.is_published and project.is_public %} + {% if project.is_impact_project and project.is_published %}
  • {% trans 'Results data' %}
  • {% else %} -
  • {% trans 'Results data' %}
  • +
  • {% trans 'Results data' %}
  • {% endif %} {% endif %} {% if project.is_published and project.is_public %} - {% has_perm 'rsr.post_updates' project as can_add_update %}
  • {% trans 'Update' %}
  • {% else %}
  • {% trans "Update" %}