From 32050acabca32ed7ac85c244f442148df593a677 Mon Sep 17 00:00:00 2001
From: Gregoo <versatile.mailbox@gmail.com>
Date: Fri, 17 Jan 2025 14:36:48 +0100
Subject: [PATCH] Remove login.is_readonly()
---
bricktracker/login.py | 10 ----------
templates/macro/form.html | 8 ++++----
templates/part/table.html | 12 ++++++------
3 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/bricktracker/login.py b/bricktracker/login.py
index 6511293..87e6683 100644
--- a/bricktracker/login.py
+++ b/bricktracker/login.py
@@ -53,13 +53,3 @@ class LoginManager(object):
not current_app.config['LOGIN_DISABLED'] and
not current_user.is_authenticated
)
-
- # Tell whether we are in read-only, meaning:
- # - Authentication enabled
- # - and User not authenticated
- @staticmethod
- def is_readonly() -> bool:
- return (
- not current_app.config['LOGIN_DISABLED'] and
- not current_user.is_authenticated
- )
diff --git a/templates/macro/form.html b/templates/macro/form.html
index 88c2588..2e2f8bb 100644
--- a/templates/macro/form.html
+++ b/templates/macro/form.html
@@ -1,13 +1,13 @@
{% macro checkbox(kind, id, text, url, checked, delete=false) %}
- {% if g.login.is_readonly() %}
- <input class="form-check-input text-reset" type="checkbox" {% if checked %}checked{% endif %} disabled>
- {{ text }}
- {% else %}
+ {% if g.login.is_authenticated() %}
<input class="form-check-input" type="checkbox" id="{{ kind }}-{{ id }}" {% if checked %}checked{% endif %}
{% if not delete %}onchange="change_set_checkbox_status(this, '{{ kind }}', '{{ id }}', '{{ url }}')"{% else %}disabled{% endif %}
autocomplete="off">
<label class="form-check-label" for="{{ kind }}-{{ id }}">
{{ text }} <i id="status-{{ kind }}-{{ id }}" class="mb-1"></i>
</label>
+ {% else %}
+ <input class="form-check-input text-reset" type="checkbox" {% if checked %}checked{% endif %} disabled>
+ {{ text }}
{% endif %}
{% endmacro %}
diff --git a/templates/part/table.html b/templates/part/table.html
index 0881bc1..013d3c8 100644
--- a/templates/part/table.html
+++ b/templates/part/table.html
@@ -25,14 +25,14 @@
{{ item.fields.total_missing }}
{% else %}
<div class="input-group">
- {% if g.login.is_readonly() %}
- <input class="form-control form-control-sm" type="text" {% if item.fields.total_missing %}value="{{ item.fields.total_missing }}"{% endif %}
- disabled autocomplete="off">
- <span class="input-group-text ri-prohibited-line"></span>
- {% else %}
+ {% if g.login.is_authenticated() %}
<input class="form-control form-control-sm flex-shrink-1" type="text" {% if item.fields.total_missing %}value="{{ item.fields.total_missing }}"{% endif %}
onchange="change_part_missing_amount(this, '{{ item.fields.u_id }}', '{{ item.fields.id }}', '{{ item.url_for_missing() }}')" autocomplete="off">
- <span id="status-item-{{ item.fields.u_id }}-{{ item.fields.id }}" class="input-group-text ri-save-line"></span>
+ <span id="status-part-{{ item.fields.u_id }}-{{ item.fields.id }}" class="input-group-text ri-save-line"></span>
+ {% else %}
+ <input class="form-control form-control-sm" type="text" {% if item.fields.total_missing %}value="{{ item.fields.total_missing }}"{% endif %}
+ disabled autocomplete="off">
+ <span class="input-group-text ri-prohibited-line"></span>
{% endif %}
</div>
{% endif %}