mirror of
https://github.com/ae-utbm/sith.git
synced 2026-05-14 04:58:06 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 51c8e1e3dc |
@@ -1,13 +1,6 @@
|
|||||||
{% if is_fragment %}
|
{% if is_fragment %}
|
||||||
{% extends "core/base_fragment.jinja" %}
|
{% extends "core/base_fragment.jinja" %}
|
||||||
|
|
||||||
{% block metatags %}
|
|
||||||
<meta property="og:url" content="{{ request.build_absolute_uri() }}" />
|
|
||||||
<meta property="og:type" content="website" />
|
|
||||||
<meta property="og:title" content="Liste des clubs et assos" />
|
|
||||||
<meta property="og:image" content="{{ request.build_absolute_uri(static("core/img/logo_no_text.png")) }}" />
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{# Don't display tabs and errors #}
|
{# Don't display tabs and errors #}
|
||||||
{% block tabs %}
|
{% block tabs %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
+4
-4
@@ -209,15 +209,15 @@ class ClubListView(AllowFragment, FormMixin, ListView):
|
|||||||
|
|
||||||
def get_form_kwargs(self):
|
def get_form_kwargs(self):
|
||||||
res = super().get_form_kwargs()
|
res = super().get_form_kwargs()
|
||||||
# if request.GET is empty, the form will interpret club_status as None,
|
if self.request.method == "GET":
|
||||||
# even though we want it to be initially True,
|
res |= {"data": self.request.GET, "initial": self.request.GET}
|
||||||
# so we force a defaut True value.
|
|
||||||
res["data"] = {"club_status": True} | self.request.GET.dict()
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
form: ClubSearchForm = self.get_form()
|
form: ClubSearchForm = self.get_form()
|
||||||
qs = self.queryset
|
qs = self.queryset
|
||||||
|
if not form.is_bound:
|
||||||
|
return qs.filter(is_active=True)
|
||||||
if not form.is_valid():
|
if not form.is_valid():
|
||||||
return qs.none()
|
return qs.none()
|
||||||
if name := form.cleaned_data.get("name"):
|
if name := form.cleaned_data.get("name"):
|
||||||
|
|||||||
+4
-3
@@ -636,16 +636,17 @@ if DEBUG:
|
|||||||
INSTALLED_APPS += ("debug_toolbar",)
|
INSTALLED_APPS += ("debug_toolbar",)
|
||||||
MIDDLEWARE = ("debug_toolbar.middleware.DebugToolbarMiddleware", *MIDDLEWARE)
|
MIDDLEWARE = ("debug_toolbar.middleware.DebugToolbarMiddleware", *MIDDLEWARE)
|
||||||
DEBUG_TOOLBAR_PANELS = [
|
DEBUG_TOOLBAR_PANELS = [
|
||||||
"debug_toolbar.panels.versions.VersionsPanel",
|
"debug_toolbar.panels.history.HistoryPanel",
|
||||||
"debug_toolbar.panels.timer.TimerPanel",
|
"debug_toolbar.panels.timer.TimerPanel",
|
||||||
"debug_toolbar.panels.settings.SettingsPanel",
|
"debug_toolbar.panels.settings.SettingsPanel",
|
||||||
"debug_toolbar.panels.headers.HeadersPanel",
|
"debug_toolbar.panels.headers.HeadersPanel",
|
||||||
"debug_toolbar.panels.request.RequestPanel",
|
"debug_toolbar.panels.request.RequestPanel",
|
||||||
"debug_toolbar.panels.sql.SQLPanel",
|
"debug_toolbar.panels.sql.SQLPanel",
|
||||||
"sith.toolbar_debug.TemplatesPanel",
|
"debug_toolbar.panels.templates.TemplatesPanel",
|
||||||
"debug_toolbar.panels.cache.CachePanel",
|
"debug_toolbar.panels.cache.CachePanel",
|
||||||
"debug_toolbar.panels.signals.SignalsPanel",
|
"debug_toolbar.panels.signals.SignalsPanel",
|
||||||
"debug_toolbar.panels.redirects.RedirectsPanel",
|
"debug_toolbar.panels.community.CommunityPanel",
|
||||||
|
"debug_toolbar.panels.profiling.ProfilingPanel",
|
||||||
]
|
]
|
||||||
if not TESTING:
|
if not TESTING:
|
||||||
SENTRY_ENV = "development" # We can't test if it gets overridden in settings
|
SENTRY_ENV = "development" # We can't test if it gets overridden in settings
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
#
|
|
||||||
# Copyright 2016,2017,2021
|
|
||||||
# - Sli <antoine@bartuccio.fr>
|
|
||||||
# - Skia <skia@hya.sk>
|
|
||||||
#
|
|
||||||
# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
|
|
||||||
# http://ae.utbm.fr.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify it under
|
|
||||||
# the terms of the GNU General Public License a published by the Free Software
|
|
||||||
# Foundation; either version 3 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
||||||
# details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along with
|
|
||||||
# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
|
|
||||||
# Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
|
|
||||||
from debug_toolbar.panels.templates import TemplatesPanel as BaseTemplatesPanel
|
|
||||||
|
|
||||||
|
|
||||||
class TemplatesPanel(BaseTemplatesPanel):
|
|
||||||
def generate_stats(self, *args):
|
|
||||||
try:
|
|
||||||
template = self.templates[0]["template"]
|
|
||||||
if not hasattr(template, "engine") and hasattr(template, "backend"):
|
|
||||||
template.engine = template.backend
|
|
||||||
except IndexError: # No template
|
|
||||||
pass
|
|
||||||
return super().generate_stats(*args)
|
|
||||||
Reference in New Issue
Block a user