django-microsys 2.2.1__tar.gz → 2.2.2__tar.gz

{django_microsys-2.2.1 → django_microsys-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_microsys
-Version: 2.2.1
+Version: 2.2.2
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
 License: NON-COMMERCIAL

{django_microsys-2.2.1 → django_microsys-2.2.2}/django_microsys.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-microsys
-Version: 2.2.1
+Version: 2.2.2
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
 License: NON-COMMERCIAL

django_microsys-2.2.2/microsys/VERSION

@@ -0,0 +1 @@
+2.2.2

{django_microsys-2.2.1 → django_microsys-2.2.2}/microsys/context_processors.py

@@ -346,6 +346,7 @@ def microsys_context(request):
     from .fonts import generate_font_face_css, get_builtin_fonts
     allowed_fonts = normalize_allowed_fonts(final_config.get('allowed_fonts'))
     context['font_face_css'] = generate_font_face_css(allowed_fonts)
+    context['option_fonts'] = [font for font in get_builtin_fonts() if font.get('slug') in allowed_fonts]
     
     allow_user_font_override = bool(final_config.get('allow_user_font_override', True))
     default_fonts_by_lang = final_config.get('default_fonts', {})

{django_microsys-2.2.1 → django_microsys-2.2.2}/microsys/forms.py

@@ -1,5 +1,6 @@
 # Imports of the required python modules and libraries
 ######################################################
+import os
 import json
 from types import MethodType, SimpleNamespace
 
@@ -1686,6 +1687,12 @@ class SystemSettingsForm(forms.ModelForm):
             if parsed_step in (0, 1, 2, 3, 4, 5):
                 self.single_step_mode = True
                 self.single_step_index = parsed_step
+        if self.mode != 'setup' and self.single_step_mode:
+            # Single-step modal posts can legitimately omit values owned by another
+            # wizard step; field-level required validation must not fire before the
+            # step-preservation cleaners get a chance to restore them.
+            self.fields['default_theme'].required = False
+            self.fields['default_table_density'].required = False
 
         from microsys.discovery import discover_sidebar_catalog, sanitize_sidebar_config
         from microsys.utils import get_system_config
@@ -2873,12 +2880,27 @@ class SystemSettingsForm(forms.ModelForm):
         return str(self.cleaned_data.get('default_language') or 'en').strip().lower().replace('_', '-')
 
     def clean_allowed_fonts(self):
+        if self.is_bound and self.mode != 'setup' and self.single_step_mode and 'allowed_fonts' not in self.data:
+            preserved = getattr(self.instance, 'allowed_fonts', None)
+            if preserved in (None, ''):
+                preserved = self.initial.get('allowed_fonts')
+            return list(normalize_allowed_fonts(preserved))
         data = self.cleaned_data.get('allowed_fonts')
         if not data:
             return []
         return list(data)
 
     def clean_default_fonts(self):
+        if self.is_bound and self.mode != 'setup' and self.single_step_mode and 'default_fonts' not in self.data:
+            preserved = getattr(self.instance, 'default_fonts', None)
+            if preserved in (None, ''):
+                preserved = self.initial.get('default_fonts')
+            if isinstance(preserved, str):
+                try:
+                    preserved = json.loads(preserved)
+                except json.JSONDecodeError:
+                    preserved = {}
+            return preserved if isinstance(preserved, dict) else {}
         data = self.cleaned_data.get('default_fonts')
         if not data:
             return {}
@@ -2891,12 +2913,27 @@ class SystemSettingsForm(forms.ModelForm):
             return {}
 
     def clean_default_theme(self):
-        value = self.cleaned_data.get('default_theme') or 'light'
+        if self.is_bound and self.mode != 'setup' and self.single_step_mode and 'default_theme' not in self.data:
+            value = (
+                getattr(self.instance, 'default_theme', None)
+                or self.initial.get('default_theme')
+                or 'light'
+            )
+        else:
+            value = self.cleaned_data.get('default_theme') or 'light'
         if not is_valid_theme(value):
             raise ValidationError("Invalid theme choice.")
         return value
 
     def clean_allowed_themes(self):
+        if self.is_bound and self.mode != 'setup' and self.single_step_mode and 'allowed_themes' not in self.data:
+            values = getattr(self.instance, 'allowed_themes', None)
+            if not values:
+                values = self.initial.get('allowed_themes')
+            normalized = list(normalize_allowed_themes(values))
+            if not normalized:
+                raise ValidationError("At least one theme must remain enabled.")
+            return normalized
         values = self.cleaned_data.get('allowed_themes') or []
         if not values:
             raise ValidationError("At least one theme must remain enabled.")
@@ -2906,7 +2943,14 @@ class SystemSettingsForm(forms.ModelForm):
         return normalized
 
     def clean_default_table_density(self):
-        value = self.cleaned_data.get('default_table_density') or DEFAULT_TABLE_DENSITY
+        if self.is_bound and self.mode != 'setup' and self.single_step_mode and 'default_table_density' not in self.data:
+            value = (
+                getattr(self.instance, 'default_table_density', None)
+                or self.initial.get('default_table_density')
+                or DEFAULT_TABLE_DENSITY
+            )
+        else:
+            value = self.cleaned_data.get('default_table_density') or DEFAULT_TABLE_DENSITY
         if value not in TABLE_DENSITY_VALUES:
             raise ValidationError("Invalid table density choice.")
         return value
@@ -3246,13 +3290,43 @@ class SystemSettingsForm(forms.ModelForm):
         if cleaned.get('registration_activation_mode') not in REGISTRATION_ACTIVATION_VALUES:
             cleaned['registration_activation_mode'] = 'auto_login_after_verify'
         email_ready = get_email_service_status().get('available')
-        if email_config.get('secret_storage') == 'encrypted_db':
+        backend = getattr(settings, 'EMAIL_BACKEND', 'django.core.mail.backends.smtp.EmailBackend')
+        local_backends = {
+            'django.core.mail.backends.console.EmailBackend',
+            'django.core.mail.backends.locmem.EmailBackend',
+            'django.core.mail.backends.filebased.EmailBackend',
+        }
+        if backend in local_backends and getattr(settings, 'DEBUG', False):
+            email_ready = True
+        elif email_config.get('transport') == 'relay':
+            relay_host = str(email_config.get('host') or os.getenv('SMTP_RELAY_HOST') or '').strip()
+            relay_port = email_config.get('port')
+            relay_from_email = str(
+                email_config.get('default_from_email')
+                or getattr(settings, 'DEFAULT_FROM_EMAIL', '')
+                or os.getenv('DEFAULT_FROM_EMAIL')
+                or ''
+            ).strip()
+            relay_password_ok = True
+            if email_config.get('secret_storage') == 'encrypted_db' and email_config.get('username'):
+                relay_password_ok = bool(email_config.get('encrypted_password'))
+            email_ready = bool(relay_host and relay_port and relay_from_email and relay_password_ok)
+        elif email_config.get('secret_storage') == 'encrypted_db':
             email_ready = bool(
                 email_config.get('host')
                 and email_config.get('port')
                 and email_config.get('default_from_email')
                 and (not email_config.get('username') or email_config.get('encrypted_password'))
             )
+        elif backend == 'django.core.mail.backends.smtp.EmailBackend':
+            email_ready = bool(
+                (email_config.get('host') or getattr(settings, 'EMAIL_HOST', ''))
+                and (email_config.get('port') or getattr(settings, 'EMAIL_PORT', None))
+                and (
+                    email_config.get('default_from_email')
+                    or getattr(settings, 'DEFAULT_FROM_EMAIL', '')
+                )
+            )
         if (cleaned.get('public_registration_enabled') or cleaned.get('email_2fa')) and not email_ready:
             self.add_error(
                 'email_config',

{django_microsys-2.2.1 → django_microsys-2.2.2}/microsys/static/microsys/main/css/system_setup.css

@@ -683,40 +683,29 @@
 }
 
 /* Font Previews Support */
-.ms-font-previews {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 1rem;
-}
-
-.ms-font-preview-card {
-  width: 100px;
-  cursor: pointer;
-  transition: all 0.2s ease-in-out;
-  border-width: 2px !important;
-  text-align: center;
-}
-
-.ms-font-preview-card.active {
-  border-color: var(--primal) !important;
-  background-color: rgba(var(--primal-rgb), 0.05);
+.ms-font-option {
+  align-items: center;
 }
 
-.ms-font-preview-card:hover:not(.active) {
-  border-color: var(--ms-setup-pane-border, rgba(var(--primal-rgb), 0.24)) !important;
+.ms-font-option__icon {
+  width: 3.5rem;
+  height: 3.5rem;
+  border-radius: 1rem;
 }
 
 .font-preview-sample {
   font-weight: 500;
+  font-size: 1.5rem;
+  line-height: 1;
 }
 
 /* Specific Font Mapping Rules for Previews */
-.ms-font-preview-card[data-font="shabwa"] .font-preview-sample,
+.ms-font-option[data-font="shabwa"] .font-preview-sample,
 .ms-font-settings-option[data-font-option="shabwa"] .font-preview-sample {
   font-family: 'Shabwa', sans-serif !important;
 }
 
-.ms-font-preview-card[data-font="cairo"] .font-preview-sample,
+.ms-font-option[data-font="cairo"] .font-preview-sample,
 .ms-font-settings-option[data-font-option="cairo"] .font-preview-sample {
   font-family: 'Cairo', sans-serif !important;
 }

{django_microsys-2.2.1 → django_microsys-2.2.2}/microsys/static/microsys/main/js/options.js

@@ -103,7 +103,9 @@
             element.addEventListener('click', function () {
                 const font = this.getAttribute('data-font');
                 // Update local UI
-                document.querySelectorAll('[data-font]').forEach(el => el.classList.toggle('active', el === this));
+                document.querySelectorAll('[data-font]').forEach((option) => {
+                    option.classList.toggle('is-active', option === this);
+                });
                 
                 // Apply immediately
                 const familyName = font.charAt(0).toUpperCase() + font.slice(1);

{django_microsys-2.2.1 → django_microsys-2.2.2}/microsys/static/microsys/main/js/system_setup.js

@@ -2858,13 +2858,15 @@
                 input.value = activeTheme;
                 allowedCheckboxes.forEach((checkbox) => {
                     const theme = checkbox.getAttribute('data-setup-theme-allowed');
-                    checkbox.disabled = checkbox.checked && resolvedAllowedThemes.length === 1;
+                    const isLocked = checkbox.checked && resolvedAllowedThemes.length === 1;
+                    checkbox.setAttribute('aria-disabled', isLocked ? 'true' : 'false');
                     const container = checkbox.closest('[data-theme-option]');
                     if (!container) {
                         return;
                     }
                     const isAllowed = resolvedAllowedThemes.includes(theme);
                     const isDefault = theme === activeTheme;
+                    container.classList.toggle('is-locked', isLocked);
                     container.classList.toggle('opacity-50', !isAllowed);
                     container.classList.toggle('is-default', isDefault);
                     const button = container.querySelector('[data-setup-theme-choice]');
@@ -2897,6 +2899,11 @@
             });
 
             allowedCheckboxes.forEach((checkbox) => {
+                checkbox.addEventListener('click', (event) => {
+                    if (checkbox.checked && getAllowedThemes().length === 1) {
+                        event.preventDefault();
+                    }
+                });
                 checkbox.addEventListener('change', () => {
                     if (!getAllowedThemes().length) {
                         checkbox.checked = true;

django_microsys-2.2.2/microsys/templates/microsys/includes/font_previews.html

@@ -0,0 +1,20 @@
+{% load static %}
+<div class="ms-font-picker" id="msFontPreviews">
+    <div class="ms-density-options" role="group" aria-label="{{ MS_TRANS.typography }}">
+    {% for font in option_fonts %}
+        <button
+            type="button"
+            class="ms-density-option ms-font-option{% if selected_font == font.slug %} is-active{% endif %}"
+            data-font="{{ font.slug }}"
+        >
+            <span class="ms-density-option__icon ms-font-option__icon" aria-hidden="true">
+                <span class="font-preview-sample">Aa</span>
+            </span>
+            <span class="ms-density-option__copy">
+                <strong>{{ font.label }}</strong>
+                <small>{{ font.slug }}</small>
+            </span>
+        </button>
+    {% endfor %}
+    </div>
+</div>

{django_microsys-2.2.1 → django_microsys-2.2.2}/microsys/templates/microsys/includes/options.html

@@ -304,7 +304,7 @@
                 <h4 class="mb-3"><i class="bi bi-fonts me-2"></i> {{ MS_TRANS.typography }}</h4>
                 <p class="text-muted small mb-4">{{ MS_TRANS.typography_desc }}</p>
 
-                {% include 'microsys/includes/font_previews.html' with selected_font=active_font allowed_fonts=APP_CONFIG.allowed_fonts %}
+                {% include 'microsys/includes/font_previews.html' with selected_font=active_font option_fonts=option_fonts %}
             </div>
         </div>
         {% endif %}

{django_microsys-2.2.1 → django_microsys-2.2.2}/microsys/utils.py

@@ -446,9 +446,12 @@ def get_email_service_status():
     """
     try:
         SystemSettings = apps.get_model('microsys', 'SystemSettings')
-        stored_email_config = normalize_email_config(getattr(SystemSettings.load(), 'email_config', {}))
+        raw_stored_email_config = getattr(SystemSettings.load(), 'email_config', {})
+        stored_email_config = normalize_email_config(raw_stored_email_config)
     except Exception:
+        raw_stored_email_config = {}
         stored_email_config = default_email_config()
+    stored_hint_keys = set(raw_stored_email_config.keys()) if isinstance(raw_stored_email_config, dict) else set()
     email_config = get_microsys_email_config(include_secret=False)
     backend = email_config.get('backend') or 'django.core.mail.backends.smtp.EmailBackend'
     from_email = email_config.get('from_email') or ''
@@ -479,13 +482,28 @@ def get_email_service_status():
         if secret_storage == 'encrypted_db' and email_config.get('username'):
             password_ok = bool(email_config.get('password_configured'))
         if transport == 'relay':
+            relay_upstream_host = (
+                stored_email_config.get('host')
+                if 'host' in stored_hint_keys and stored_email_config.get('host')
+                else (os.getenv('SMTP_RELAY_HOST', '') or '')
+            )
+            relay_upstream_port = (
+                stored_email_config.get('port')
+                if 'port' in stored_hint_keys and stored_email_config.get('port')
+                else int(os.getenv('SMTP_RELAY_PORT', '587') or '587')
+            )
+            relay_from_email = (
+                stored_email_config.get('default_from_email')
+                if 'default_from_email' in stored_hint_keys and stored_email_config.get('default_from_email')
+                else (getattr(settings, 'DEFAULT_FROM_EMAIL', '') or os.getenv('DEFAULT_FROM_EMAIL', '') or '')
+            )
             relay_password_ok = True
             if stored_email_config.get('secret_storage') == 'encrypted_db' and stored_email_config.get('username'):
                 relay_password_ok = bool(stored_email_config.get('password_configured'))
             configured = bool(
-                stored_email_config.get('host')
-                and stored_email_config.get('port')
-                and stored_email_config.get('default_from_email')
+                relay_upstream_host
+                and relay_upstream_port
+                and relay_from_email
                 and relay_password_ok
             )
             return {
@@ -495,8 +513,8 @@ def get_email_service_status():
                 'from_email': from_email,
                 'transport': transport,
                 'secret_storage': secret_storage,
-                'detail': f"{host}:{port} -> {stored_email_config.get('host')}:{stored_email_config.get('port')}"
-                if host and port and stored_email_config.get('host') and stored_email_config.get('port') else '',
+                'detail': f"{host}:{port} -> {relay_upstream_host}:{relay_upstream_port}"
+                if host and port and relay_upstream_host and relay_upstream_port else '',
                 'reason': 'relay_configured' if configured else (
                     'relay_missing_password' if not relay_password_ok else 'relay_missing_upstream_host_port_or_from_email'
                 ),

{django_microsys-2.2.1 → django_microsys-2.2.2}/microsys/views/sections.py

@@ -948,7 +948,7 @@ class DynamicModalManagerView(LoginRequiredMixin, View):
         except (TypeError, ValueError):
             return None
 
-        if 0 <= step <= 4:
+        if 0 <= step <= 5:
             return step
         return None
 
@@ -1077,6 +1077,12 @@ class DynamicModalManagerView(LoginRequiredMixin, View):
             'hide_form_buttons': getattr(form, "_auto_helper", False) or has_submit_button(form),
             'wizard_initial_step': self._get_wizard_initial_step(model),
         }
+        if self._is_system_settings_model(model):
+            logger.warning(
+                "SystemSettings modal validation failed on step %s: %s",
+                request.GET.get('step'),
+                form.errors.get_json_data(),
+            )
         # Render combined view for validation failure
         html = render_to_string('microsys/helpers/dynamic_modal_combined.html', context, request=request)
         return JsonResponse({'success': False, 'html': html})

django_microsys-2.2.1/microsys/VERSION

@@ -1 +0,0 @@
-2.2.1

django_microsys-2.2.1/microsys/templates/microsys/includes/font_previews.html

@@ -1,12 +0,0 @@
-{% load static %}
-<div class="d-flex flex-wrap gap-3 ms-font-previews" id="msFontPreviews">
-    {% for font_slug in allowed_fonts %}
-    <div class="ms-font-preview-card border rounded p-2 text-center cursor-pointer {% if selected_font == font_slug %}active{% endif %}" 
-         data-font="{{ font_slug }}">
-        <div class="font-preview-sample h3 mb-1">
-            Aa
-        </div>
-        <div class="small fw-semibold">{{ font_slug|title }}</div>
-    </div>
-    {% endfor %}
-</div>