Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-09 20:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-dashboard-timers' into 'v4.x'

Browse Source 
[FIX] EveCorporationInfo matching query does not exist

See merge request allianceauth/allianceauth!1552
This commit is contained in:
Ariel Rin 2023-10-31 10:01:03 +00:00
commit c541f56ee2
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
allianceauth/timerboard/views.py
View File

@ -13,8 +13,9 @@ from django.template.loader import render_to_string
from django.utils import timezone from django.utils import timezone
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from .form import TimerForm from allianceauth.timerboard.form import TimerForm
from .models import Timer from allianceauth.timerboard.models import Timer
from allianceauth.eveonline.models import EveCorporationInfo
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -91,12 +92,18 @@ class RemoveTimerView(TimerManagementView, DeleteView):
def dashboard_timers(request): def dashboard_timers(request):
try:
corp = request.user.profile.main_character.corporation corp = request.user.profile.main_character.corporation
except EveCorporationInfo.DoesNotExist:
return ""
timers = Timer.objects.select_related('eve_character').filter((Q(eve_corp__isnull=True) | Q(eve_corp=corp)) ,eve_time__gte=timezone.now())[:5] timers = Timer.objects.select_related('eve_character').filter((Q(eve_corp__isnull=True) | Q(eve_corp=corp)) ,eve_time__gte=timezone.now())[:5]
if timers.count(): if timers.count():
context = { context = {
'timers': timers, 'timers': timers,
} }
return render_to_string('timerboard/dashboard.timers.html', context=context, request=request)
return render_to_string(template_name='timerboard/dashboard.timers.html', context=context, request=request)
else: else:
return "" return ""