use last open period as default period

diff --git a/teleforma/admin.py b/teleforma/admin.py
index d396415ec3b9f92e0296b1a0649c21e50a996063..40cf8093fe6cff4f1a0a6f6b7308d42ee553099e 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -369,8 +369,7 @@ class MediaAdmin(admin.ModelAdmin):
 
     def get_form(self, request, obj=None, **kwargs):
         form = super(MediaAdmin, self).get_form(request, obj, **kwargs)
-        periods = Period.objects.all()
-        period = get_default_period(periods)
+        period = get_default_period()
         form.base_fields['conference'].queryset = Conference.objects.filter(period=period)
         return form
 

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 68dea393aeaa754ec79a7d71285c37a25aa24623..5a5f45c2dad5baddf8ffc7765bcafd664d68ff98 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -236,13 +236,9 @@ def get_periods(request):
     return periods
 
 
-def get_default_period(periods):
-    if periods:
-        return periods[0]
-    else:
-        period_id = getattr(settings, 'TELEFORMA_PERIOD_DEFAULT_ID', 1)
-        default_period = Period.objects.get(id=period_id)
-        return default_period
+def get_default_period():
+    period = Period.objects.filter(is_open=True).order_by("-date_begin")[0]
+    return period
 
 
 def content_to_pdf(content, dest, encoding='utf-8', **kwargs):
@@ -335,10 +331,9 @@ class HomeRedirectView(View):
         if request.user.is_authenticated:
             period_id = request.session.get('period_id')
             if not period_id:
-                periods = get_periods(request)
-                period = get_default_period(periods)
+                period = get_default_period()
+                request.session['period_id'] = period.id
                 period_id = period.id
-                request.session['period_id'] = period_id
             return HttpResponseRedirect(reverse('teleforma-desk-period-list', kwargs={'period_id': period_id}))
         else:
             return HttpResponseRedirect(reverse('teleforma-login'))