argus-server 2.2.2__tar.gz → 2.3.0__tar.gz

{argus_server-2.2.2 → argus_server-2.3.0}/.mailmap

@@ -1,5 +1,6 @@
 # canonical
 
+Aleksander Fløtten <aleksander.flotten@sikt.no>
 Alexander Staff <alexamst@stud.ntnu.no>
 Andreas Melzer <akrimelzer@gmail.com>
 Dabble <ddabble@users.noreply.github.com>
@@ -11,12 +12,14 @@ Karoline Bonnerud <kbonnerud@gmail.com>
 Kat Hößel <kathoe@uninett.no>
 Morten Brekkevold <morten.brekkevold@sikt.no>
 Pelle Koster <elfjes@users.noreply.github.com>
+Simen Abelsen <simen@abelweb.no>
 Simon Oliver Tveit <simon.tveit@sikt.no>
 Theodor Astrup Wiik <theo.aw@hotmail.com>
 dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 jorund1 <jorund@washbear.eu>
 
 # rewrites
+Aleksander Fløtten <aleksander.flotten@sikt.no> aleksfl <99869083+aleksfl@users.noreply.github.com>
 Alexander Staff <alexamst@stud.ntnu.no> <34887403+Tralphium@users.noreply.github.com>
 Dabble <ddabble@users.noreply.github.com> Anders <6058745+ddabble@users.noreply.github.com>
 Hanne Moa <hanne.moa@sikt.no> <hanne.moa@uninett.no>

{argus_server-2.2.2 → argus_server-2.3.0}/CHANGELOG.md

@@ -8,6 +8,80 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [2.3.0] - 2025-11-20
+
+This release has numerous improvements to the frontend. The various
+widgets on the incident list page now work better together, and where
+there are more than one to choose from the choices are now sorted
+alphabetically. No user preferences are left in the user menu. The
+preference page has had a slight rework though more is planned.
+
+The big new thing is the possibility to select more than one column
+layout. You can now choose a preferred layout on the user preferences
+page if any have been configured in addition to the standard one.
+A nice looking preview of each configured layout is planned for the
+next release.
+
+Due to the possibility of choosing between multiple column layouts,
+several new types of columns have been added. There's also a new
+section in the reference documentation explaining and naming all the
+built-in column types.
+
+See NOTES.md for how to convert an existing column layout to the new format.
+
+### Added
+
+- Sort list of filters in filter dropdown alphabetically
+  ([#1553](https://github.com/Uninett/Argus/issues/1553))
+- Sort list of sources in filter dropdown alphabetically
+  ([#1554](https://github.com/Uninett/Argus/issues/1554))
+- [#1576](https://github.com/Uninett/Argus/issues/1576)
+- Added and documented more searchable columns for the incident list:
+  `search_description`, `select_levels`, `has_ticket_url`,
+  `search_ticket_url`, and a way to mass-produce single-field forms to
+  add even more searchable columns and eventually systematize the
+  incident filter forms in the topmost box.
+- Make it possible to define more than one column layout, and make it
+  possible to switch between them via a user preference. Fixes #1581,
+  #1582.
+- Added the column `narrow_start_time`.
+
+### Changed
+
+- Remove user preferences from global header dropdown
+  ([#1567](https://github.com/Uninett/Argus/issues/1567))
+- Use DaisyUI dropdowns in searchable columns
+  ([#1574](https://github.com/Uninett/Argus/issues/1574))
+- Sort filter dropdowns for update / delete filter alphabetically
+  ([#1592](https://github.com/Uninett/Argus/issues/1592))
+- Add consistent title to notification config pages
+  ([#1606](https://github.com/Uninett/Argus/issues/1606))
+- Auto-align filterable column dropdown if it extends beyond the screen
+  ([#1607](https://github.com/Uninett/Argus/issues/1607))
+- Fixed several problems with filtering the incident list in the
+  frontend: the various widgets were stepping on each others toes.
+  Made much easier by turning all GET-abble filters into Django forms.
+- Improved documentation of how notificationprofiles with multiple
+  filters work, with changes to the user manual, new tests, and a help
+  text added to the field in question in the frontend.
+- Preferences are all now properly backed by forms, inheriting from
+  `SimplePreferenceForm` which is a perfect fit for preferences where
+  you choose one of several options. Using `PreferenceField` directly
+  will still work, but the form used now receives the request on
+  `__init__`. It is therefore necessary to upgrade the old forms by
+  either mixing in the `ClassicPreferenceFormMixin`, which will
+  discard the passed-in `request`, or writing your own `__init__` that
+  will prevent passing in the `request` via `super().__init__(*args,
+  **kwargs)`.
+- User preferences were refactored. This is to increase consistency,
+  cut down on copypasta, and eventually use Django forms on the user
+  preference page, but more importantly: Django settings are no longer
+  read on import. Turns out, preferences that depend on Django
+  settings *sometimes* read the settings too soon, before the
+  settings-file was complete, and therefore getting the wrong or no
+  setting.
+
+
 ## [2.2.2] - 2025-11-03
 
 ### Added

{argus_server-2.2.2 → argus_server-2.3.0}/CONTRIBUTORS.md

@@ -34,3 +34,5 @@
 ## 2025
 
 * [James Ladd](https://github.com/jladd-geant) \<james.ladd@geant.org\>
+* [Simen Abelsen](https://github.com/Simrayz) \<simen@abelweb.no\>
+* [Aleksander Fløtten](https://github.com/aleksfl) \<aleksander.flotten@sikt.no\>

{argus_server-2.2.2 → argus_server-2.3.0}/NOTES.md

@@ -3,6 +3,60 @@
 This file documents changes to Argus that are relevant for operations,
 customizers and end-users.
 
+## [2.3.0] - 2025-11-20
+
+This release has numerous improvements to the frontend. The various
+widgets on the incident list page now work better together, and where
+there are more than one to choose from the choices are now sorted
+alphabetically. No user preferences are left in the user menu. The
+preference page has had a slight rework though more is planned.
+
+The big new thing is the possibility to select more than one column
+layout. You can now choose a preferred layout on the user preferences
+page if any have been configured in addition to the standard one.
+A nice looking preview of each configured layout is planned for the
+next release.
+
+Due to the possibility of choosing between multiple column layouts,
+several new types of columns have been added. There's also a new
+section in the reference documentation explaining and naming all the
+built-in column types.
+
+As of this release, please convert the setting `INCIDENT_TABLE_COLUMNS` to the
+new `INCIDENT_TABLE_COLUMN_LAYOUTS` setting. Usage of `INCIDENT_TABLE_COLUMNS`
+is deprecated and support will eventually be removed.
+
+If your current `INCIDENT_TABLE_COLUMNS` looks like this:
+
+```
+INCIDENT_TABLE_COLUMNS = [
+    "row_select",
+    "combined_status",
+    "source",
+    "description",
+]
+```
+
+then the equivalent new setting looks like:
+
+```
+INCIDENT_TABLE_COLUMN_LAYOUTS = {
+    "default": [
+        "row_select",
+        "combined_status",
+        "source",
+        "description",
+    ]
+}
+```
+
+This will make it possible to select between two different layouts: "built-in"
+and "default". If you wish to hide the built-in layout, use the name
+"built-in" for one of the layouts in `INCIDENT_TABLE_COLUMN_LAYOUTS`.
+
+If you do not convert the setting, the layout defined in the old setting will
+be available as "default" together with the built-in layout as "built-in".
+
 ## [2.2.2] - 2025-11-03
 
 To aid in development there a live styleguide for the frontend on

{argus_server-2.2.2 → argus_server-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-server
-Version: 2.2.2
+Version: 2.3.0
 Summary: Argus is an alert aggregator for monitoring systems
 Project-URL: Homepage, https://github.com/Uninett/Argus
 Author-email: Uninett Opensource <opensource@uninett.no>

{argus_server-2.2.2 → argus_server-2.3.0}/docs/customization/htmx-frontend.rst

@@ -119,8 +119,9 @@ How to customize the look:
 Incident table column customization
 ===================================
 
-The :setting:`INCIDENT_TABLE_COLUMNS` setting controls which columns are shown
-in the incident table. This setting takes a list of ``str`` or
+The :setting:`INCIDENT_TABLE_COLUMN_LAYOUTS` setting controls which columns are
+shown in the incident table. This setting takes a dictionary where the key is
+the name of a layout and the value is a list of ``str`` or
 ``argus.htmx.incidents.customization.IncidentTableColumn`` instances. when
 given a ``str``, this key must be available in the
 ``argus.htmx.incidents.customization.BUILTIN_COLUMNS`` dictionary. For
@@ -128,17 +129,21 @@ example::
 
     from argus.htmx.incidents.customization import BUILTIN_COLUMNS, IncidentTableColumn
 
-    INCIDENT_TABLE_COLUMNS = [
-        "id",
-        "start_time",
-        BUILTIN_COLUMNS["description"], # equivalent to just "description"
-        IncidentTableColumn( # a new column definition
-            name="name",
-            label="Custom",
-            cell_template="/path/to/template.html",  # contents of cell
-        ),
+    INCIDENT_TABLE_COLUMN_LAYOUTS = {
+        "default": [
+            "id",
+            "start_time",
+            BUILTIN_COLUMNS["description"], # equivalent to just "description"
+            IncidentTableColumn( # a new column definition
+                name="name",
+                label="Custom",
+                cell_template="/path/to/template.html",  # contents of cell
+            ),
+        ]
+    }
 
-    ]
+The settings :setting:`INCIDENT_TABLE_COLUMNS` took a single list and is
+deprecated. If it exists it is interpreted as a layout named "default".
 
 
 .. py:class:: IncidentTableColumn
@@ -172,11 +177,21 @@ example::
       a ``<td>``-tag. This makes it possible to add attributes to the
       ``<td>``-tag or skip including the ``cell_template`` altogether.
 
+      Deprecated: see ``detail_link``
+
       Replacing the default with
       ``htmx/incident/_incident_table_cell_wrapper_link_to_details.html`` will
       result in the ``cell_template`` being wrapped in a link (``<a>``) to the
       details page.
 
+   .. py:attribute::detail_link
+
+      :type: bool
+      :value: False
+
+      Setting ``detail_link`` to ``True`` will wrap the contents of the cell
+      with a link (``<a>``) to the details page.
+
    .. py:attribute:: column_classes
 
       :type: str
@@ -243,7 +258,7 @@ You could then create ``path/to/_extra_widget.html`` as following::
 
 
 Toast messages
---------------
+==============
 
 ``argus_htmx`` uses the `Django Messages`_ framework to dynamically display notifications toast
 messages to the user. Some of these messages stay on screen until the user refreshes, while others

{argus_server-2.2.2 → argus_server-2.3.0}/docs/development/howtos/htmx-frontend/override_templates.rst

@@ -83,7 +83,7 @@ an extensive list, but can provide entry points or inspiration:
   ``hx-swap-oob`` content, to a incident list htmx partial response
 * ``htmx/user/_user_menu.html``: add or remove items to the user menu (the menu that appears when
   clicking on the user's initials in the top right)
-* ``htmx/user/preferences.html``: add custom preferences to the preferences page
+* ``htmx/user/preferences_list.html``: add custom preferences to the preferences page
 * ``registration/login.html``: show additional information to a user prior to logging in, such as
   a link to a privacy policy or other terms
 

argus_server-2.3.0/docs/development/howtos/sonarqube.rst

@@ -0,0 +1,19 @@
+=======================
+Howto: Handle sonarqube
+=======================
+
+We use `sonarqube`_ to scan new code for potential issues and security hotspots.
+It posts comments on pull requests when it finds new issues in that code using rules
+defined by the developer team at Sikt.
+
+But we sometimes also disagree with how it handles parts of certain rules. We will
+document that here and which comment to use when marking such an issue as accepted or
+false positive.
+
+python:S1192 - String literals should not be duplicated
+-------------------------------------------------------
+
+If it makes it more readable, for example if configuration is happening within the
+Python code, then we accept it with "This is better for readability".
+
+.. _sonarqube: https://www.sonarsource.com/products/sonarcloud/

{argus_server-2.2.2 → argus_server-2.3.0}/docs/reference/htmx-frontend.rst

@@ -172,13 +172,137 @@ a time), and the user can select a different page size from ``[10, 20, 50,
 :setting:`ARGUS_INCIDENTS_DEFAULT_PAGE_SIZE` (an integer) and
 :setting:`ARGUS_INCIDENTS_PAGE_SIZES` setting respectively.
 
-Incident table column customization
------------------------------------
+.. _table-column-reference:
 
-You can customize which columns are shown in the incidents listing table by
-overriding the :setting:`INCIDENT_TABLE_COLUMNS` setting. See
+Table columns
+-------------
+
+Argus ships with more possible column types than what are configured by
+default.
+
+The columns to use are set with the :setting:`INCIDENT_TABLE_COLUMN_LAYOUTS`
+setting.
+
+This is the default for the setting as of this version of Argus:
+
+.. code-block:: python3
+
+   INCIDENT_TABLE_COLUMN_LAYOUTS = {
+      "built-in": [
+          "color_status",
+          "row_select",
+          "start_time",
+          "combined_status",
+          "level",
+          "source",
+          "description",
+          "ticket",
+       ]
+   }
+
+You can define your own columns from scratch, see
 :ref:`customize-htmx-frontend` for examples.
 
+All built-in columns
+~~~~~~~~~~~~~~~~~~~~
+
+ack
+    :From: ack
+    :Name: ack
+    :Description: Show whether the incident is acked or not.
+    :Redundant with: combined_status
+
+color_status
+    :From: ack + status
+    :Name: color_status
+    :Description: A combination of ackedness and openness, shown only as a color.
+
+combined_status
+    :From: ack + status
+    :Name: combined_status
+    :Description: Merges the "open" column and the "ack" column into one.
+
+description
+    :From: description
+    :Name: description
+    :Description: The contents of the description-field of the incident.
+    :Redundant with: search_description
+
+search_description
+    :From: description
+    :Name: search_description
+    :Description: Search for (free text) all tickets that matches and show their
+                  incidents.
+    :Redundant with: description
+
+id
+    :From: id
+    :Name: id
+    :Description: The internal id of the incident in argus.
+
+level
+    :From: level
+    :Name: level
+    :Description: The severity level.
+    :Redundant with: select_levels
+
+select_levels
+    :From: level
+    :Name: select_levels
+    :Description: The severity level. One or more can be selected. Might conflict
+                  with the notification filter field ``maxlevel``. If maxlevel is
+                  set to less than max, you will get no results if searching for
+                  the max via this field.
+    :Redundant with: level
+
+status
+    :From: open
+    :Name: status
+    :Description: Whether the incident is still ongoing or has been closed.
+    :Redundant with: combined_status
+
+row_select
+    :From: depends on incident id
+    :Name: row_select
+    :Description: Checkbox to select the row for bulk changes.
+
+source
+    :From: source
+    :Name: source
+    :Description: The source of the incident.
+
+start_time
+    :From: start_time
+    :Name: start_time
+    :Description: When the incident started, fixed width.
+
+narrow_start_time
+    :From: start_time
+    :Name: start_time
+    :Description: When the incident started, width depends on date format.
+
+ticket
+    :From: ticket_url
+    :Name: ticket
+    :Description: A link to a ticket/issue in an external system with more information.
+    :Redundant with: has_ticket_url, search_ticket_url
+
+has_ticket_url
+    :From: ticket_url
+    :Name: has_ticket_url
+    :Description: A link to a ticket/issue in an external system with more information.
+                  Can toggle showing only incidents that has or lacks a ticket url.
+    :Redundant with: ticket, search_ticket_url
+
+search_ticket_url
+    :From: ticket_url
+    :Name: search_ticket_url
+    :Description: A link to a ticket/issue in an external system with more information.
+                  Can search through all the tickets for the term, and only show
+                  the matching incidents.
+    :Redundant with: ticket, has_ticket_url
+
+
 Themes
 ------
 

{argus_server-2.2.2 → argus_server-2.3.0}/docs/reference/site-specific-settings.rst

@@ -315,8 +315,35 @@ Ticket system settings
 ``TICKET_PLUGIN``, ``TICKET_ENDPOINT``, ``TICKET_AUTHENTICATION_SECRET``,
 ``TICKET_INFORMATION`` are all described in :ref:`ticket-systems-settings`.
 
+Frontend settings
+-----------------
+
+.. setting:: INCIDENT_TABLE_COLUMN_LAYOUTS
+
+* :setting:`INCIDENT_TABLE_COLUMN_LAYOUTS` allows adding one or more choosable
+  incident list column layouts in addition to the built-in layout. Format::
+
+    INCIDENT_TABLE_COLUMN_LAYOUTS = {
+        "default": [
+            "row_select",
+            "combined_status",
+            "source",
+            "description",
+        ]
+    }
+
+  See :ref:`table-column-reference` for the built-in layout and a list of all
+  available built-in column types.
+
+.. setting:: INCIDENT_TABLE_COLUMNS
+
+* :setting:`INCIDENT_TABLE_COLUMNS`
+
+The old, deprecated variant of :setting:`INCIDENT_TABLE_COLUMN_LAYOUTS`, it
+only supported a single column layout.
+
 Special environment settings
-----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. setting:: BANNER_MESSAGE
 
@@ -344,4 +371,3 @@ Debugging settings
 
 * :setting:`TEMPLATE_DEBUG` (optional) provides a convenient way to turn debugging on and off
   for templates. If undefined it will default to the value of :setting:`DEBUG`.
-

{argus_server-2.2.2 → argus_server-2.3.0}/docs/user-manual.rst

@@ -626,19 +626,43 @@ receive by creating, editing and deleting *notification profiles*.
 About components of notification profiles
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-1. **Timeslot** allows you to customize **when** you want to receive the
-   alarm notifications. You can choose one timeslot per notification
-   profile. Timeslots are reusable across multiple notification
-   profiles.
-2. **Filter** allows you to customize **what** alarms (incidents) you
-   want to receive the notifications about. You can choose multiple
-   filters per notification profile. Filters are reusable across
-   multiple notification profiles.
-3. **Destination** allows you to customize **where** you want to receive
-   the alarm notifications. You can choose multiple destinations per
-   notification profile. Destinations are reusable across multiple
-   notification profiles. Destinations may be of `different media
-   types <#about-the-available-notification-media>`_.
+Timeslot
+^^^^^^^^
+
+**Timeslot** allows you to customize **when** you want to receive
+the alarm notifications. You can choose one timeslot per
+notification profile. Timeslots are reusable across multiple
+notification profiles.
+
+Filter
+^^^^^^
+
+**Filter** allows you to customize **what** alarms (incidents) you
+want to receive the notifications about. Filters are reusable
+across multiple notification profiles.
+
+You can choose multiple filters per notification profile. They are
+*combined to increase precision*. You cannot use *one* profile for
+*sufficiently different types of incidents*.
+
+For instance, if an incident may only ever have one tag that
+starts with ``hostname=``, then having a profile with multiple
+filters, each asking for *different* hostnames, will never be able
+to match anything.
+
+If you need to match multiple hostname tags in a profile, make
+a filter that only matches hostnames and include that filter in
+the profile.
+
+Destination
+^^^^^^^^^^^
+
+**Destination** allows you to customize **where** you want to
+receive the alarm notifications. You can choose multiple
+destinations per notification profile. Destinations are reusable
+across multiple notification profiles. Destinations may be of
+`different media types
+<#about-the-available-notification-media>`_.
 
 .. _about-the-available-notification-media:
 About the available notification media

{argus_server-2.2.2 → argus_server-2.3.0}/requirements-django52.txt

@@ -37,7 +37,7 @@ defusedxml==0.7.1
     #   social-auth-core
 dj-database-url==2.3.0
     # via argus-server (pyproject.toml)
-django==5.2.7
+django==5.2.8
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)

{argus_server-2.2.2 → argus_server-2.3.0}/requirements.txt

@@ -37,7 +37,7 @@ defusedxml==0.7.1
     #   social-auth-core
 dj-database-url==2.3.0
     # via argus-server (pyproject.toml)
-django==5.2.7
+django==5.2.8
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)

{argus_server-2.2.2 → argus_server-2.3.0}/src/argus/auth/models.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import dataclasses
 import functools
-from typing import Any, Optional, Sequence, Union, Protocol
+from typing import Any, Optional, Protocol, Sequence
 
 from django.contrib.auth.models import AbstractUser, Group
 from django.db import models
@@ -80,7 +80,7 @@ class User(AbstractUser):
     def is_end_user(self):
         return not hasattr(self, "source_system")
 
-    def is_member_of_group(self, group: Union[str, Group]):
+    def is_member_of_group(self, group: str | Group):
         if isinstance(group, str):
             try:
                 group = Group.objects.get(name=group)

{argus_server-2.2.2 → argus_server-2.3.0}/src/argus/auth/utils.py

@@ -1,6 +1,6 @@
 from copy import deepcopy
 import logging
-from typing import Mapping, Union
+from typing import Mapping
 
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend, RemoteUserBackend
@@ -62,7 +62,7 @@ def get_preference(request, namespace, preference):
     return prefs.get_preference(preference)
 
 
-def save_preferences(request, data, namespace_or_prefs: Union[str, Preferences]):
+def save_preferences(request, data, namespace_or_prefs: str | Preferences):
     prefs = (
         namespace_or_prefs
         if isinstance(namespace_or_prefs, Preferences)
@@ -98,7 +98,7 @@ def _save_preference(request: HttpRequest, prefs: Preferences, preference: str,
         LOG.debug("Failed to change %s, not in input: %s", preference, data)
         return value, False
 
-    form = prefs.get_forms()[preference](data)
+    form = prefs.get_forms()[preference](data, request=request)
 
     if not form.is_valid():
         messages.warning(request, f"Failed to change {preference}, invalid input")

{argus_server-2.2.2 → argus_server-2.3.0}/src/argus/filter/filterwrapper.py

@@ -132,6 +132,10 @@ class ComplexFilterWrapper:
         self.profile = kwargs.pop("profile", None)
 
     def incident_fits(self, incident: Incident) -> bool:
+        """Check against multiple filters
+
+        The filters are AND-ed together for greater precision.
+        """
         if not self.profile.active:
             return False
         is_selected_by_time = self.profile.timeslot.timestamp_is_within_time_recurrences(incident.start_time)

{argus_server-2.2.2 → argus_server-2.3.0}/src/argus/htmx/constants.py

@@ -1,4 +1,3 @@
-from argus.htmx.dateformat.constants import DATETIME_CHOICES, DATETIME_DEFAULT, DATETIME_FORMATS
 from argus.htmx.incident.constants import (
     INCIDENTS_TABLE_LAYOUT_CHOICES,
     INCIDENTS_TABLE_LAYOUT_DEFAULT,
@@ -9,19 +8,12 @@ from argus.htmx.incident.constants import (
     TIMEFRAME_CHOICES,
     TIMEFRAME_DEFAULT,
 )
-from argus.htmx.themes.constants import THEME_CHOICES, THEME_DEFAULT, THEME_NAMES
 
 __all__ = [
-    "DATETIME_CHOICES",
-    "DATETIME_DEFAULT",
-    "DATETIME_FORMATS",
     "INCIDENTS_TABLE_LAYOUT_CHOICES",
     "INCIDENTS_TABLE_LAYOUT_DEFAULT",
     "PAGE_SIZE_DEFAULT",
     "PAGE_SIZE_CHOICES",
-    "THEME_CHOICES",
-    "THEME_DEFAULT",
-    "THEME_NAMES",
     "UPDATE_INTERVAL_CHOICES",
     "UPDATE_INTERVAL_DEFAULT",
     "TIMEFRAME_CHOICES",

{argus_server-2.2.2 → argus_server-2.3.0}/src/argus/htmx/dateformat/constants.py

@@ -2,10 +2,8 @@ import dataclasses
 from django.conf import settings
 
 __all__ = [
-    "DATETIME_FALLBACK",
     "DATETIME_FORMATS",
-    "DATETIME_DEFAULT",
-    "DATETIME_CHOICES",
+    "get_datetime_format_default",
 ]
 
 
@@ -26,10 +24,12 @@ DATETIME_FORMATS = {
     "RFC5322": DateTimeFormat("r", "r", "r"),
     "EPOCH": DateTimeFormat("U", "U", "U"),
 }
-DATETIME_CHOICES = tuple((format, format) for format in DATETIME_FORMATS)
 
-_datetime_setting = getattr(settings, "ARGUS_FRONTEND_DATETIME_FORMAT", DATETIME_FALLBACK)
 
-DATETIME_DEFAULT = DATETIME_FALLBACK
-if _datetime_setting in DATETIME_FORMATS:
-    DATETIME_DEFAULT = _datetime_setting
+def get_datetime_format_default():
+    _datetime_setting = getattr(settings, "ARGUS_FRONTEND_DATETIME_FORMAT", DATETIME_FALLBACK)
+
+    datetime_default = DATETIME_FALLBACK
+    if _datetime_setting in DATETIME_FORMATS:
+        datetime_default = _datetime_setting
+    return datetime_default

{argus_server-2.2.2 → argus_server-2.3.0}/src/argus/htmx/defaults.py

@@ -1,7 +1,7 @@
 # customize the displayed columns in the incident table
 # items in INCIDENT_TABLE_COLUMNS can be either a `str` referring to a key in
-# argus.htmx.incident.customization.BUILTIN_COLUMNS or an instance of
-# argus.htmx.incident.customization.IncidentTableColumn
+# argus.htmx.incident.columns.BUILTIN_COLUMNS or an instance of
+# argus.htmx.incident.columns.IncidentTableColumn
 from argus.site.settings import get_json_env, get_str_env