Merge bdf96cb into 4e01fce

watchdogpolska · Jul 21, 2019 · f22a720 · f22a720
2 parents 4e01fce + bdf96cb
commit f22a720
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/.contrib/docker/Dockerfile.web b/.contrib/docker/Dockerfile.web
@@ -17,4 +17,5 @@ RUN apt-get update \
 COPY requirements/*.txt ./requirements/
 ARG DJANGO_VERSION='==1.11.21'
 RUN pip install --no-cache-dir -r requirements/dev.txt "django${DJANGO_VERSION}"
+RUN apt-get update && apt-get install -y gettext libgettextpo-dev
 CMD ["bash", "-c", "python manage.py collectstatic --no-input && python manage.py migrate && python manage.py runserver 0.0.0.0:8000"]
diff --git a/poradnia/users/locale/en/LC_MESSAGES/django.po b/poradnia/users/locale/en/LC_MESSAGES/django.po
@@ -98,10 +98,14 @@ msgstr ""
 msgid "Keys"
 msgstr ""
 
-#: templates/users/user_detail.html:41 templates/users/user_filter.html:43
+#: templates/users/user_filter.html:43 templates/users/user_detail.html:41
 msgid "Client cases"
 msgstr ""
 
+#: templates/users/user_detail.html:41
+msgid "My cases"
+msgstr ""
+
 #: templates/users/user_detail.html:48
 msgid "Assigned cases"
 msgstr ""

diff --git a/poradnia/users/locale/pl/LC_MESSAGES/django.po b/poradnia/users/locale/pl/LC_MESSAGES/django.po
@@ -190,10 +190,14 @@ msgstr "Zmiana hasła"
 msgid "Keys"
 msgstr "Klucze"
 
-#: templates/users/user_detail.html:41 templates/users/user_filter.html:39
+#: templates/users/user_filter.html:39 templates/users/user_detail.html:41
 msgid "Client cases"
 msgstr "Sprawy klienta"
 
+#: templates/users/user_detail.html:41
+msgid "My cases"
+msgstr "Moje sprawy"
+
 #: templates/users/user_detail.html:48
 msgid "Assigned cases"
 msgstr "Przypisane sprawy"

diff --git a/poradnia/users/templates/users/user_detail.html b/poradnia/users/templates/users/user_detail.html
@@ -33,16 +33,16 @@ <h2>{{ object.username }}</h2>
             <i class="fa fa-puzzle-piece "></i>
             {% trans 'Keys' %}
         </a>
-    {% endif %}
+          <a class="btn btn-info" href="{% url 'cases:list' %}?client={{ object.pk }}">
+              <i class="fa fa-book"></i>
+              {% trans 'My cases' %}
+          </a>
 
-    {% if object == request.user or perms.cases.can_assign %}
+    {% elif perms.cases.can_assign %}
         <a class="btn btn-info" href="{% url 'cases:list' %}?client={{ object.pk }}">
             <i class="fa fa-book"></i>
             {% trans 'Client cases' %}
         </a>
-    {% endif %}
-
-    {% if perms.cases.can_assign %}
         <a class="btn btn-info" href="{% url 'cases:list' %}?permission={{ object.pk }}">
             <i class="fa fa-book"></i>
             {% trans 'Assigned cases' %}