From 8c3e3dc7e4697be96952046034e78a5d8fcbefca Mon Sep 17 00:00:00 2001
From: FSMPI Admin-Team <admin@fsmpi.rwth-aachen.de>
Date: Wed, 14 Jun 2017 22:44:00 +0200
Subject: [PATCH] Do not use `a or b` if a could be 0.
/close #135
---
templates/decisions-list.html | 8 +++++++-
templates/protocols-list.html | 8 +++++++-
templates/todos-list.html | 8 +++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/templates/decisions-list.html b/templates/decisions-list.html
index a6c3928..61dd296 100644
--- a/templates/decisions-list.html
+++ b/templates/decisions-list.html
@@ -3,7 +3,13 @@
{% block title %}Beschlüsse{% endblock %}
{% macro page_link(text, _page=None, _page_length=None) %}
- <a href="{{url_for(request.endpoint, page=_page or page, protocoltype=protocoltype_id, search=search_term, decisioncategory_id=decisioncategory_id, page_length=_page_length or page_length)}}">{{text}}</a>
+ {% if _page is none %}
+ {% set _page = page %}
+ {% endif %}
+ {% if _page_length is none %}
+ {% set _page_length = page_length %}
+ {% endif %}
+ <a href="{{url_for(request.endpoint, page=_page, protocoltype=protocoltype_id, search=search_term, decisioncategory_id=decisioncategory_id, page_length=_page_length)}}">{{text}}</a>
{% endmacro %}
{% block content %}
diff --git a/templates/protocols-list.html b/templates/protocols-list.html
index c3a2d36..acbd418 100644
--- a/templates/protocols-list.html
+++ b/templates/protocols-list.html
@@ -3,7 +3,13 @@
{% block title %}Protokolle{% endblock %}
{% macro page_link(text, _page=None, _page_length=None) %}
- <a href="{{url_for(request.endpoint, page=_page or page, protocoltype=protocoltype_id, search=search_term, state_open=state_open, page_length=_page_length or page_length)}}">{{text}}</a>
+ {% if _page is none %}
+ {% set _page = page %}
+ {% endif %}
+ {% if _page_length is none %}
+ {% set _page_length = page_length %}
+ {% endif %}
+ <a href="{{url_for(request.endpoint, page=_page, protocoltype=protocoltype_id, search=search_term, state_open=state_open, page_length=_page_length)}}">{{text}}</a>
{% endmacro %}
{% block content %}
diff --git a/templates/todos-list.html b/templates/todos-list.html
index 49f8134..0b0fca5 100644
--- a/templates/todos-list.html
+++ b/templates/todos-list.html
@@ -3,7 +3,13 @@
{% block title %}Todos{% endblock %}
{% macro page_link(text, _page=None, _page_length=None) %}
- <a href="{{url_for(request.endpoint, page=_page or page, protocoltype=protocoltype_id, search=search_term, state_open=state_open, page_length=_page_length or page_length)}}">{{text}}</a>
+ {% if _page is none %}
+ {% set _page = page %}
+ {% endif %}
+ {% if _page_length is none %}
+ {% set _page_length = page_length %}
+ {% endif %}
+ <a href="{{url_for(request.endpoint, page=_page, protocoltype=protocoltype_id, search=search_term, state_open=state_open, page_length=_page_length)}}">{{text}}</a>
{% endmacro %}
{% block content %}
--
GitLab