Merge branch 'master' into corputils

2026-02-13 02:26:24 +01:00 · 2016-01-19 22:02:14 +01:00
parent 030a0e9a8c 991049375b
commit b7c1c8469d
11 changed files with 152 additions and 20 deletions
--- a/stock/templates/public/base.html
+++ b/stock/templates/public/base.html
@@ -106,7 +106,7 @@
                            </li>
                        {% endif %}

-                        {% if not perms.auth.member and not perms.auth.blue_member or perms.auth.human_resources %}
+                        {% if not perms.auth.member or perms.auth.human_resources %}
                            <li>
                                <a {% ifequal request.path "/hr_application_management/" %}
                                    class="active" {% endifequal %}