Merge branch 'v4.x' into 'aa-framework-part-2'

# Conflicts: # allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html # allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
2025-07-09 12:30:15 +02:00 · 2023-12-24 17:34:07 +00:00 · 2023-12-24 17:34:07 +00:00 · 547d047f59
commit 547d047f59
parent b2e70c3702 5cd92e29d3
12 changed files with 22 additions and 22 deletions
--- a/allianceauth/authentication/templates/public/base.html
+++ b/allianceauth/authentication/templates/public/base.html
@ -32,7 +32,7 @@
            }

            .card-login {
-                background: rgba(48  48  48 / 0.7);
+                background: rgba(48 48 48 / 0.7);
                color: rgb(255 255 255);
                padding-bottom: 21px;
            }
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
@ -45,7 +45,7 @@
                            <td class="text-center">{{ fat.user }}</td>
                            <td class="text-center">{{ fat.character.character_name }}</td>
                            <td class="text-center">
-                                {%  if fat.station != "No Station" %}
+                                {% if fat.station != "No Station" %}
                                    {% translate "Docked in" %}
                                {% endif %}
                                {{ fat.system }}
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@ -59,7 +59,7 @@
            <div class="card card-default">
                <div class="card-header">
                    <div class="card-title mb-0">
-                        {% blocktranslate count links=n_created_fats trimmed  %}
+                        {% blocktranslate count links=n_created_fats trimmed %}
                            {{ user }} has created one link this month.
                        {% plural %}
                            {{ user }} has created {{ links }} links this month.
@ -88,14 +88,14 @@
                                <td class="text-center">{{ link.fatdatetime }}</td>
                                <td class="text-center">{{ link.duration }}</td>
                                <td class="text-center">
-                                    <a href="{%  url 'fatlink:modify' link.hash %}">
+                                    <a href="{% url 'fatlink:modify' link.hash %}">
                                        <button type="button" class="btn btn-info">
                                            <i class="fa-solid fa-pen-to-square fa-fw"></i>
                                        </button>
                                    </a>
                                </td>
                            </tr>
-                        {%  endfor %}
+                        {% endfor %}
                    </table>
                </div>
            </div>
--- a/allianceauth/fleetactivitytracking/views.py
+++ b/allianceauth/fleetactivitytracking/views.py
@ -377,12 +377,12 @@ def modify_fatlink_view(request, fat_hash=None):
    if request.GET.get('removechar', None):
        character_id = request.GET.get('removechar')
        character = EveCharacter.objects.get(character_id=character_id)
-        logger.debug(f"Removing character {character.character_name} from fleetactivitytracking  {fatlink}")
+        logger.debug(f"Removing character {character.character_name} from fleetactivitytracking {fatlink}")

        Fat.objects.filter(fatlink=fatlink).filter(character=character).delete()

    if request.GET.get('deletefat', None):
-        logger.debug("Removing fleetactivitytracking  %s" % fatlink)
+        logger.debug("Removing fleetactivitytracking %s" % fatlink)
        fatlink.delete()
        return redirect('fatlink:view')

--- a/allianceauth/groupmanagement/migrations/0004_authgroup.py
+++ b/allianceauth/groupmanagement/migrations/0004_authgroup.py
@ -74,11 +74,11 @@ class Migration(migrations.Migration):
        migrations.CreateModel(
            name='AuthGroup',
            fields=[
-                ('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False,  to='auth.Group')),
+                ('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.Group')),
                ('internal', models.BooleanField(default=True, help_text='Internal group, users cannot see, join or request to join this group.<br>Used for groups such as Members, Corp_*, Alliance_* etc.<br><b>Overrides Hidden and Open options when selected.</b>')),
                ('hidden', models.BooleanField(default=True, help_text='Group is hidden from users but can still join with the correct link.')),
                ('open', models.BooleanField(default=False, help_text='Group is open and users will be automatically added upon request. <br>If the group is not open users will need their request manually approved.')),
-                ('description', models.CharField(max_length=512, blank=True,  help_text='Description of the group shown to users.', )),
+                ('description', models.CharField(max_length=512, blank=True, help_text='Description of the group shown to users.', )),

                ('group_leaders', models.ManyToManyField(related_name='leads_groups', to=settings.AUTH_USER_MODEL, blank=True, help_text='Group leaders can process group requests for this group specifically. Use the auth.group_management permission to allow a user to manage all groups.',)),
            ],
--- a/allianceauth/groupmanagement/templates/groupmanagement/index.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html
@ -24,7 +24,7 @@
        </a>
    </li>

-    {%  if not show_leave_tab %}
+    {% if not show_leave_tab %}
        <li>
            <a class="nav-link" id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave" type="button" role="tab" aria-controls="leave" aria-selected="false">
                {% translate "Leave Requests" %}
@ -105,7 +105,7 @@
            {% endif %}
        </div>

-        {%  if not show_leave_tab %}
+        {% if not show_leave_tab %}
            <div id="leave" class="tab-pane">
                {% if leaverequests %}
                    <div class="table-responsive">
--- a/allianceauth/hrapplications/admin.py
+++ b/allianceauth/hrapplications/admin.py
@ -13,7 +13,7 @@ class ChoiceInline(admin.TabularInline):
@admin.register(ApplicationQuestion)
 class QuestionAdmin(admin.ModelAdmin):
    fieldsets = [
-            (None,      {'fields': ['title', 'help_text', 'multi_select']}),
+            (None, {'fields': ['title', 'help_text', 'multi_select']}),
            ]
    inlines = [ChoiceInline]

--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@ -44,7 +44,7 @@
                                <td class="text-center">
                                    {% if personal_app.approved == None %}
                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
-                                    {% elif  personal_app.approved == True %}
+                                    {% elif personal_app.approved == True %}
                                        <div class="badge bg-success">{% translate "Approved" %}</div>
                                    {% else %}
                                        <div class="badge bg-danger">{% translate "Rejected" %}</div>
@ -137,7 +137,7 @@
                                                    {% else %}
                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
                                                    {% endif %}
-                                                {% elif  app.approved == True %}
+                                                {% elif app.approved == True %}
                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                                {% else %}
                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
@ -181,7 +181,7 @@
                                                    {% else %}
                                                        <div class="badge bg-warning">{% translate "Pending" %}</div>
                                                    {% endif %}
-                                                {% elif  app.approved == True %}
+                                                {% elif app.approved == True %}
                                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                                {% else %}
                                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@ -44,7 +44,7 @@
                            <td class="text-center">
                                {% if app.approved == None %}
                                    <div class="badge bg-warning">{% translate "Pending" %}</div>
-                                {% elif  app.approved == True %}
+                                {% elif app.approved == True %}
                                    <div class="badge bg-success">{% translate "Approved" %}</div>
                                {% else %}
                                    <div class="badge bg-danger">{% translate "Rejected" %}</div>
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@ -7,7 +7,7 @@
        <div style="width: 350px;">
            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 auth-logo">
                {% if user.is_authenticated %}
-                    <ul style="z-index:5;"  id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
+                    <ul style="z-index:5;" id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
                        <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
                            <i class="nav-link fas fa-tachometer-alt fa-fw align-self-center me-3 {% navactive request 'authentication:dashboard' %}"></i>
                            <a class="nav-link flex-fill align-self-center" href="{% url 'authentication:dashboard' %}">
--- a/allianceauth/templates/bundles/moment-js.html
+++ b/allianceauth/templates/bundles/moment-js.html
@ -1,7 +1,7 @@
 <!-- Start Moment.js from cdnjs -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/moment.min.js" integrity="sha512-+H4iLjY3JsKiF2V6N366in5IQHj2uEsGV7Pp/GRcm0fn76aPAk5V8xB6n8fQhhSonTqTXs/klFz4D0GIn6Br9g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 {% if locale and LANGUAGE_CODE != 'en' %}
-    <!-- Moment.JS Not EN-en  -->
+    <!-- Moment.JS Not EN-en -->
    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/locale/{{ LANGUAGE_CODE }}.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 {% endif %}
 <!-- End Moment JS from cdnjs -->
--- a/allianceauth/timerboard/templates/timerboard/view.html
+++ b/allianceauth/timerboard/templates/timerboard/view.html
@ -121,7 +121,7 @@
            }
        };

-        const updateAllTimers = () =>  {
+        const updateAllTimers = () => {
            const l = timers.length;

            for (let i=0; i < l; ++i) {
@ -142,7 +142,7 @@
        /**
         * Set all local time fields
         */
-        const setAllLocalTimes = () =>  {
+        const setAllLocalTimes = () => {
            const l = timers.length;

            for (let i=0; i < l; ++i) {
@ -150,11 +150,11 @@
            }
        };

-        const updateClock = () =>  {
+        const updateClock = () => {
            document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
        };

-        const timedUpdate = () =>  {
+        const timedUpdate = () => {
            updateClock();
            updateAllTimers();
        }