Browse Source

added filters to section 'edited by me'

funding-tag
Holger Frey 4 years ago
parent
commit
2c6b210631
  1. 4
      CHANGES.md
  2. 2
      ordr3/__init__.py
  3. 6
      ordr3/templates/orders/list.jinja2

4
CHANGES.md

@ -1,4 +0,0 @@
0.0.1 - first version
----------------------
- first initial release

2
ordr3/__init__.py

@ -3,7 +3,7 @@
A rewrite of our CPI ordering system. A rewrite of our CPI ordering system.
""" """
__version__ = "1.1.0" __version__ = "1.1.1"
from pyramid.config import Configurator from pyramid.config import Configurator

6
ordr3/templates/orders/list.jinja2

@ -21,7 +21,7 @@
{% endfor %} {% endfor %}
</nav> </nav>
{% if request.has_permission("batch-edit", context) %} {% if request.has_permission("batch-edit", context) and query_defaults['user'] != '-purchaser-' %}
<nav class="nav nav-pills flex-column mt-3"> <nav class="nav nav-pills flex-column mt-3">
<div class="nav-link disabled text-small" tabindex="-1" aria-disabled="true">Specials</div> <div class="nav-link disabled text-small" tabindex="-1" aria-disabled="true">Specials</div>
<a class="nav-link {% if query_defaults['user'] == '-purchaser-' %}active{% endif %}" href="{{ context|resource_url(query=query_defaults(status=None, user='-purchaser-', search=None)) }}">Edited by me</a> <a class="nav-link {% if query_defaults['user'] == '-purchaser-' %}active{% endif %}" href="{{ context|resource_url(query=query_defaults(status=None, user='-purchaser-', search=None)) }}">Edited by me</a>
@ -29,9 +29,9 @@
{% endif %} {% endif %}
{% if query_defaults['user'] not in (None, request.user.username, '-purchaser-') %} {% if query_defaults['user'] not in (None, request.user.username) %}
<nav class="nav nav-pills flex-column mt-3"> <nav class="nav nav-pills flex-column mt-3">
<div class="nav-link disabled text-small" tabindex="-1" aria-disabled="true">{{ query_defaults['user'] }}</div> <div class="nav-link disabled text-small" tabindex="-1" aria-disabled="true">{{ query_defaults['user'] if query_defaults['user'] != '-purchaser-' else "Edited By Me" }}</div>
<a class="nav-link {% if query_defaults['status'] == 'all' %}active{% endif %}" href="{{ context|resource_url(query=query_defaults(status=None, user=query_defaults['user'], search=None)) }}">All</a> <a class="nav-link {% if query_defaults['status'] == 'all' %}active{% endif %}" href="{{ context|resource_url(query=query_defaults(status=None, user=query_defaults['user'], search=None)) }}">All</a>
{% for status in stati %} {% for status in stati %}
<a class="nav-link {% if query_defaults['status'] == status.name.lower() %}active{% endif %}" href="{{ context|resource_url(query=query_defaults(status=status.name.lower(), user=query_defaults['user'], search=None)) }}">{{status.name.lower()}}</a> <a class="nav-link {% if query_defaults['status'] == status.name.lower() %}active{% endif %}" href="{{ context|resource_url(query=query_defaults(status=status.name.lower(), user=query_defaults['user'], search=None)) }}">{{status.name.lower()}}</a>

Loading…
Cancel
Save