Skip to content
Snippets Groups Projects
Commit 6420368a authored by Benjamin Hättasch's avatar Benjamin Hättasch
Browse files

Minor improvements

Load custom css in admin interface, too
Fix lading of locales in scheduler
Improve icon in scheduler
Reduce SQL query amount in scheduler
parent 6de64302
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<script src="{% static "common/vendor/moment/moment-with-locales.js" %}"></script> <script src="{% static "common/vendor/moment/moment-with-locales.js" %}"></script>
<script src="{% static "common/js/availabilities.js" %}"></script> <script src="{% static "common/js/availabilities.js" %}"></script>
{% with 'common/vendor/fullcalendar/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %} {% with 'common/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %}
{% if LANGUAGE_CODE != "en" %} {% if LANGUAGE_CODE != "en" %}
{# Locale 'en' is included in main.js and does not exist separately #} {# Locale 'en' is included in main.js and does not exist separately #}
<script src="{% static locale_file %}"></script> <script src="{% static locale_file %}"></script>
......
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
table_html += '<tr><td>'; table_html += '<tr><td>';
if(response[i].level_display==='{% trans "Violation" %}') if(response[i].level_display==='{% trans "Violation" %}')
table_html += '{% fa5_icon "exclamation-circle" "fas" %}'; table_html += '{% fa5_icon "exclamation-triangle" "fas" %}';
else else
table_html += '{% fa5_icon "info-circle" "fas" %}'; table_html += '{% fa5_icon "info-circle" "fas" %}';
......
...@@ -30,7 +30,7 @@ class SchedulingAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView): ...@@ -30,7 +30,7 @@ class SchedulingAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView):
context_object_name = "slots_unscheduled" context_object_name = "slots_unscheduled"
def get_queryset(self): def get_queryset(self):
return super().get_queryset().filter(start__isnull=True).order_by('ak__track') return super().get_queryset().filter(start__isnull=True).select_related().order_by('ak__track')
def get_context_data(self, *, object_list=None, **kwargs): def get_context_data(self, *, object_list=None, **kwargs):
context = super().get_context_data(object_list=object_list, **kwargs) context = super().get_context_data(object_list=object_list, **kwargs)
......
...@@ -4,3 +4,4 @@ ...@@ -4,3 +4,4 @@
*/ */
@import "/static/common/css/bootstrap.css"; @import "/static/common/css/bootstrap.css";
@import "../../admin/css/base.css"; @import "../../admin/css/base.css";
@import "/static/common/css/custom.css";
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment