cleanup

diff --git a/teleforma/admin.py b/teleforma/admin.py
index 27b8e6df75b39ececb04e34bb4242cff574d66ae..46d8ca9fdf8b0be7c2909233571f96eda88b5d2c 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -31,7 +31,7 @@ from .models.crfpa import (IEJ, Corrector, Discount, Home, NewsItem,
                            Student, Training)
 from .models.messages import GroupedMessage, StudentGroup
 from .views.crfpa import CorrectorXLSBook, UserXLSBook
-from .views.core import get_default_period
+from .views.core import get_periods
 
 from django.contrib.admin.helpers import ActionForm
 from django import forms
@@ -370,7 +370,7 @@ class MediaAdmin(admin.ModelAdmin):
 
     def get_form(self, request, obj=None, **kwargs):
         form = super(MediaAdmin, self).get_form(request, obj, **kwargs)
-        period = get_default_period()
+        period = get_periods(request)
         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 355c1735de669b904c676250ea2a7dbc089daebd..fa4485ba154d4a5c4bc2a8c296bb85bda1cd7e7a 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -84,6 +84,10 @@ import weasyprint
 
 logger = logging.getLogger('teleforma')
 
+access_error = _('Access not allowed.')
+contact_message = _(
+    'Please login or contact the website administator to get a private access.')
+
 
 def format_courses(courses, course=None, queryset=None, types=None):
     if queryset:
@@ -185,11 +189,6 @@ def get_access(obj, courses):
     return access
 
 
-access_error = _('Access not allowed.')
-contact_message = _(
-    'Please login or contact the website administator to get a private access.')
-
-
 def get_host(request):
     host = request.META['HTTP_HOST']
     if ':' in host:
@@ -236,11 +235,6 @@ def get_periods(request):
     return periods
 
 
-def get_default_period(request):
-    # period = Period.objects.filter(is_open=True).order_by("-date_begin")[0]
-    return get_periods(request)[0]
-
-
 def content_to_pdf(content, dest, encoding='utf-8', **kwargs):
     """
     Write into *dest* file object the given html *content*.
@@ -331,7 +325,7 @@ class HomeRedirectView(View):
         if request.user.is_authenticated:
             period_id = request.session.get('period_id')
             if not period_id:
-                period_id = get_default_period(request).id
+                period_id = get_periods(request)[0].id
             return HttpResponseRedirect(reverse('teleforma-desk-period-list', kwargs={'period_id': period_id}))
         else:
             return HttpResponseRedirect(reverse('teleforma-login'))
@@ -348,7 +342,7 @@ class PeriodAccessMixin(View):
             period_id = int(self.kwargs['period_id'])
             self.period = get_object_or_404(Period, pk=period_id)
         else:
-            period = get_default_period()
+            period = get_periods(request)[0]
             period_id = period.id
             self.period = period
         self.request.session['period_id'] = period_id

diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 384955c819e0d360019f151dda682d5354b27b7e..89771f46ecef9220f673a1af364cf1cb2b1caede 100644 (file)
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -67,7 +67,7 @@ from ..models.core import Course, CourseType, Document, NamePaginator, Period
 from ..models.crfpa import (IEJ, Discount, NewsItem, Parameters, Payback,
                             Payment, Profile, Student, Training, months_choices, payment_choices)
 from ..views.core import (CourseAccessMixin, PDFTemplateResponseMixin, format_courses,
-                          get_courses, get_periods, get_default_period)
+                          get_courses, get_periods)
 from ..views.profile import ProfileView
 
 def get_course_code(obj):
@@ -773,7 +773,7 @@ class UserCompleteView(TemplateView):
             student = user.student.all()[0]
             context['period'] = student.period
         else:
-            context['period'] = get_default_period()
+            context['period'] = get_periods(self.request)[0]
         return context