Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-09 08:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#   allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
#   allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
This commit is contained in:
Peter Pfeufer
2023-12-24 17:34:07 +00:00
parent b2e70c3702 5cd92e29d3
commit 547d047f59
12 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
allianceauth/hrapplications/admin.py
View File

@@ -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]

6
allianceauth/hrapplications/templates/hrapplications/management.html
View File

@@ -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>

2
allianceauth/hrapplications/templates/hrapplications/searchview.html
View File

@@ -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>