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

[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

View File

@ -13,8 +13,9 @@ from django.template.loader import render_to_string
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from .form import TimerForm
from .models import Timer
from allianceauth.timerboard.form import TimerForm
from allianceauth.timerboard.models import Timer
from allianceauth.eveonline.models import EveCorporationInfo
logger = logging.getLogger(__name__)
@ -91,12 +92,18 @@ class RemoveTimerView(TimerManagementView, DeleteView):
def dashboard_timers(request):
corp = request.user.profile.main_character.corporation
try:
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]
if timers.count():
context = {
'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:
return ""