changes to fully incorpereate the school info managment back into the working system

changes to the autorisation system for the page autorisation to have a continued line of page authentification and no discrepencies in the Software it self
change of the HTML Signature
2026-07-30 23:55:46 +02:00 · 2026-07-30 23:34:06 +02:00 · 2026-07-30 16:52:34 +02:00 · 2026-07-30 01:09:58 +02:00
4 changed files with 9 additions and 12 deletions
@@ -12241,9 +12241,6 @@ def test_push_notification():
    if 'username' not in session:
        return jsonify({'success': False, 'error': 'Not authenticated'}), 401
    
-    if not us.is_admin(session['username']):
-        return jsonify({'success': False, 'error': 'Admin access required'}), 403
-    
    try:
        data = request.get_json(silent=True) or {}
        target_user = data.get('target_user', session['username'])
@@ -37,14 +37,14 @@ def send(email: list | str, subject: str, note: str, sender: str) -> bool:
        <tr>
            <td>
                <p style="margin:0 0 12px 0;">Mit freundlichen Grüßen</p>
-                <p style="margin:0;"><strong style="font-size:16px;">Automatisierter Email Verteiler für die Schule: {cfg.get_school_info().get("name")}</strong><br></p>
+                <p style="margin:0;"><strong style="font-size:16px;">Automatisierter Email Verteiler für die Schule: {cfg.get_school_info().get("name")}</strong><br></p><br>
                <p style="margin:12px 0 0 0;"><strong>Invario UG</strong><br>Am Sportplatz 10<br>83052 Bruckmühl</p>
            </td>
        </tr>
    </table>
    """

-    text_content = f"{body_message}\n\nMit freundlichen Grüßen\n{sender}\nInvario UG"
+    text_content = f"{body_message}\n\nMit freundlichen Grüßen\n{sender}\n"

    html_content = f"""
    <html>
@@ -252,8 +252,8 @@ def new(date_start: str, date_end: str, time_span: list, slots, slot_length, use
    if calendar_link:
        email_body += f"\n\nKalendereintrag: {calendar_link}"

-    if normalized_mail and cfg.EMAIL_ENABLED:
-        mail_service.send(normalized_mail, subject, email_body)
+    #if normalized_mail and cfg.EMAIL_ENABLED:
+    mail_service.send(normalized_mail, subject, email_body, f"Terminplanungssystem {cfg.SCHOOL_INFO_DEFAULT.get("name")}")

    return {
        'appointment_id': id_str,
@@ -1148,7 +1148,7 @@
                                {% if current_permissions.pages.get('tutorial_page', False) %}
                                <li><a class="dropdown-item" href="{{ url_for('tutorial_page') }}">Tutorial</a></li>
                                {% endif %}
-                                {% if current_permissions.pages.get('admin_school_settings', False) %}
+                                {% if current_permissions.actions.get('can_manage_settings', False) %}
                                <li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
                                {% endif %}
                                {% if current_permissions.actions.get('can_view_logs', False) or current_permissions.pages.get('admin_audit_dashboard', False) %}
@@ -1257,7 +1257,7 @@
                                {% if current_permissions.pages.get('manage_locations', False) %}
                                <li><a class="dropdown-item" href="{{ url_for('manage_locations') }}">Orte verwalten</a></li>
                                {% endif %}
-                                {% if current_permissions.pages.get('admin_school_settings', False) %}
+                                {% if current_permissions.actions.get('can_manage_settings', False) %}
                                <li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
                                {% endif %}
                                {% if current_permissions.pages.get('admin_borrowings', False) %}
@@ -1379,7 +1379,7 @@
                                <li><a class="dropdown-item" href="{{ url_for('student_cards_admin') }}">Bibliotheksausweis</a></li>
                                {% endif %}
                                {% endif %}
-                                {% if current_permissions.pages.get('admin_school_settings', False) %}
+                                {% if current_permissions.actions.get('can_manage_settings', False) %}
                                <li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
                                {% endif %}
                                <li><hr class="dropdown-divider"></li>
@@ -1698,7 +1698,7 @@
            <option value="Orte verwalten"></option>
            {% endif %}

-            {% if current_permissions.pages.get('admin_school_settings', False) %}
+            {% if current_permissions.actions.get('can_manage_settings', False) %}
            <option value="Schulstammdaten"></option>
            {% endif %}

@@ -1823,7 +1823,7 @@
                    { label: 'Orte verwalten', keywords: ['orte verwalten', 'orte', 'location'], url: {{ url_for('manage_locations')|tojson }} },
                    {% endif %}
                    
-                    {% if current_permissions.pages.get('admin_school_settings', False) %}
+                    {% if current_permissions.actions.get('can_manage_settings', False) %}
                    { label: 'Schulstammdaten', keywords: ['schule', 'settings', 'stammdaten', 'school settings'], url: {{ url_for('admin_school_settings')|tojson }} },
                    {% endif %}
Author	SHA1	Message	Date
Aiirondev_dev	7368d82fc4	changes to fully incorpereate the school info managment back into the working system	2026-07-30 23:55:46 +02:00
Aiirondev_dev	3e5e243ddf	changes to the autorisation system for the page autorisation to have a continued line of page authentification and no discrepencies in the Software it self	2026-07-30 23:34:06 +02:00
Aiirondev_dev	8176cea8fe	change of the HTML Signature	2026-07-30 16:52:34 +02:00
Aiirondev_dev	b71f2e9089	changes	2026-07-30 01:09:58 +02:00