Merge branch 'master' into release

Author: toebivankenoebi

docker-app/Dockerfile

@@ -17,6 +17,7 @@ RUN apt-get update \
     libpq-dev \
     python3-dev \
     gcc \
+    git \
     && rm -rf /var/lib/apt/lists/*
 
 # install `pip-compile` (as part of `pip-tools`)

docker-app/qfieldcloud/core/admin.py

@@ -25,8 +25,9 @@
 from django.contrib.admin.templatetags.admin_urls import admin_urlname
 from django.contrib.admin.views.main import ChangeList
 from django.contrib.auth.models import Group
-from django.contrib.auth.views import redirect_to_login
+from django.contrib.auth.views import logout_then_login, redirect_to_login
 from django.core.exceptions import PermissionDenied, ValidationError
+from django.core.files.storage import storages
 from django.db.models import Q, QuerySet
 from django.db.models.fields.json import JSONField
 from django.db.models.functions import Lower
@@ -68,6 +69,7 @@
 from qfieldcloud.core.templatetags.filters import filesizeformat10
 from qfieldcloud.core.utils import get_file_storage_choices
 from qfieldcloud.core.utils2 import delta_utils, jobs, pg_service_file
+from qfieldcloud.filestorage.backend import QfcS3Boto3Storage
 from qfieldcloud.filestorage.models import File
 
 
@@ -99,6 +101,12 @@ def login(
             request.GET.get("next", ""), login_url=reverse(settings.LOGIN_URL)
         )
 
+    def logout(  # type: ignore[override]
+        self, request: HttpRequest, extra_context: dict[str, Any] | None = None
+    ) -> HttpResponse:
+        """Override the default Django admin logout view to redirect to the Allauth's logout view."""
+        return logout_then_login(request)
+
     # TODO consider adding a logout view to redirect to the Allauth's logout view, but then we lose the nice template we have right now.
 
 
@@ -855,6 +863,26 @@ def __init__(self, *args, **kwargs):
         )
         if self.instance.has_attachments_files:
             self.fields["attachments_file_storage"].disabled = True
+            self.fields["are_attachments_versioned"].disabled = True
+
+    def clean_are_attachments_versioned(self):
+        value = self.cleaned_data["are_attachments_versioned"]
+
+        if value:
+            return value
+
+        # attachments can not be unversioned if attachments are stored on S3.
+        attachment_storage_value = self.cleaned_data["attachments_file_storage"]
+        attachment_storage = storages[attachment_storage_value]
+
+        if isinstance(attachment_storage, QfcS3Boto3Storage):
+            raise ValidationError(
+                _(
+                    "The '{}' attachments file storage is not compatible with unversioned attachment files."
+                ).format(attachment_storage_value)
+            )
+
+        return value
 
 
 class ProjectAdmin(QFieldCloudModelAdmin):
@@ -899,6 +927,7 @@ class ProjectAdmin(QFieldCloudModelAdmin):
         "file_storage",
         "file_storage_migrated_at",
         "attachments_file_storage",
+        "are_attachments_versioned",
         "is_attachment_download_on_demand",
         "project_files",
     )

docker-app/qfieldcloud/core/migrations/0093_project_are_attachments_versioned.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.25 on 2025-11-13 16:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0092_project_restricted_data_last_updated_at"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="project",
+            name="are_attachments_versioned",
+            field=models.BooleanField(
+                default=True,
+                help_text="If enabled, attachment files will make use of the file versioning system. If disabled, only the latest version of each attachment file will be kept, and stored with the extension in the filename.",
+                verbose_name="Versioned attachment files",
+            ),
+        ),
+    ]

docker-app/qfieldcloud/core/models.py

@@ -1262,6 +1262,14 @@ class Meta:
         ),
     )
 
+    are_attachments_versioned = models.BooleanField(
+        default=True,
+        verbose_name=_("Versioned attachment files"),
+        help_text=_(
+            "If enabled, attachment files will make use of the file versioning system. If disabled, only the latest version of each attachment file will be kept, and stored with the extension in the filename."
+        ),
+    )
+
     restricted_data_last_updated_at = models.DateTimeField(
         _("Restricted data last updated at"),
         blank=True,

docker-app/qfieldcloud/core/staticfiles/css/admin.css

@@ -1,7 +1,3 @@
-.login-logo img {
-    width: 100%;
-}
-
 .object-tools{
     margin-bottom: 1rem;
 }

docker-app/qfieldcloud/core/staticfiles/css/qfieldcloud.css

@@ -37,6 +37,22 @@ h1, h2, h3, h4, h5, h6 {
 
 .qfc-header-logo {
   height: 1.5rem;
+  margin-left: 1rem;
+}
+
+.qfc-logo-wrapper {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-height: 15rem;
+  padding: 1rem 0;
+}
+
+.qfc-main-logo {
+  max-width: 100%;
+  max-height: 15rem;
+  width: auto;
+  height: auto;
 }
 
 .ml-5rem {

docker-app/qfieldcloud/core/staticfiles/sso/microsoft.svg

@@ -9,11 +9,11 @@
 
   {% sri_static 'css/vendor.css' %}
   {% sri_static 'css/qfieldcloud.css' %}
-  <link rel="shortcut icon" type="image/x-icon" href="{% static 'favicon.ico' %}" />
+  <link rel="shortcut icon" type="image/x-icon" href="{% static whitelabel.favicon %}" />
 
   <title>
     {% block title %}
-      {% block title_contents %}{{ title }}{% endblock title_contents %} | {{ site_title|default:_('QFieldCloud') }}
+      {% block title_contents %}{{ title }}{% endblock title_contents %} | {{ whitelabel.site_title }}
     {% endblock title %}
   </title>
 
@@ -25,7 +25,7 @@
   <!-- Navbar -->
   <nav class="navbar navbar-expand-md navbar-dark nav-fill w-100 bg-primary">
     <a href="{% url 'index' %}">
-      <img src="{% static 'logo_sidetext_white.svg' %}" alt="QFieldCloud" class="logo-nav qfc-header-logo ml-1">
+      <img src="{% static whitelabel.logo_navbar %}" alt="{{ whitelabel.logo_alt }}" class="qfc-header-logo">
     </a>
 
 
@@ -37,9 +37,9 @@
       <div class="flex-shrink-0 col-12">
         <div class="row">
           <div class="col-lg-6 offset-lg-3">
-            <p class="text-center">
-              <img src="{% static 'logo_undertext.svg' %}" alt="QFieldCloud" class="logo-nav" style="height: 15rem">
-            </p>
+            <div class="qfc-logo-wrapper">
+              <img src="{% static whitelabel.logo_main %}" alt="{{ whitelabel.logo_alt }}" class="qfc-main-logo">
+            </div>
 
             {% block content %}{% endblock content %}
 

docker-app/qfieldcloud/core/templates/account/base.html

@@ -0,0 +1,51 @@
+import copy
+from typing import Any
+
+from django.conf import settings
+from django.http import HttpRequest
+from django.utils.translation import gettext as _
+
+# Default whitelabel configuration
+DEFAULT_WHITELABEL = {
+    # Branding
+    "site_title": _("QFieldCloud"),
+    # Logos (paths relative to static directory)
+    "logo_navbar": "logo_sidetext_white.svg",
+    "logo_main": "logo_undertext.svg",
+    "favicon": "favicon.ico",
+}
+
+
+def get_whitelabel_settings() -> dict[str, Any]:
+    """
+    Get whitelabel settings by merging user settings with defaults.
+    Filters out None values from user settings to preserve defaults.
+    """
+    # Start with a deep copy of defaults
+    whitelabel_settings = copy.deepcopy(DEFAULT_WHITELABEL)
+
+    user_settings = {}
+    for k, v in getattr(settings, "WHITELABEL", {}).items():
+        if v is None:
+            continue
+
+        user_settings[k] = v
+
+    # Update defaults with user settings
+    whitelabel_settings.update(user_settings)
+
+    # Post-processing: Add any computed defaults or normalization here
+    # Example: favicon could default to logo_navbar if not set
+    # whitelabel_settings["favicon"] = whitelabel_settings["favicon"] or "default.ico"
+
+    return whitelabel_settings
+
+
+def whitelabel(request: HttpRequest) -> dict[str, Any]:
+    """Make whitelabel configuration available to all templates with translations."""
+
+    whitelabel_config = get_whitelabel_settings()
+
+    return {
+        "whitelabel": whitelabel_config,
+    }

docker-app/qfieldcloud/core/whitelabel.py

@@ -259,3 +259,21 @@ def patch_nginx_download_redirect(self, response: HttpResponse) -> None:
         b64_auth = base64.b64encode(self.basic_auth.encode()).decode()
         basic_auth = f"Basic {b64_auth}"
         response["webdav_auth"] = basic_auth
+
+    def is_name_available(self, name, max_length=None):
+        # TODO: Delete with QF-7176 and Django >= 5.1 upgrade.
+        # see https://github.com/django/django/blob/6f35c2e1fd71ff8f349598a59689514e213490e7/django/core/files/storage/base.py#L54
+        exceeds_max_length = max_length and len(name) > max_length
+        return not self.exists(name) and not exceeds_max_length
+
+    def get_available_name(self, name: str, max_length: int | None = None) -> str:
+        """Returns a filename that is available on the configured webdav storage.
+
+        Arguments:
+            name: desired relative path of the file on the webdav server.
+            max_length: maximum length of the filename (not used)."""
+
+        if self.is_name_available(name, max_length):
+            return super().get_available_name(name, max_length)
+
+        return name