Fix imports and HttpResponse mimetypes

diff --git a/teleforma/admin.py b/teleforma/admin.py
index 5e9505d99325e568d793a321a6813dd0147554fe..b133ad86531ccf416260fcf736ffedb61d3e000f 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -208,7 +208,7 @@ else:
     def export_xls(self, request, queryset):
         book = UserXLSBook(students=queryset)
         book.write()
-        response = HttpResponse(mimetype="application/vnd.ms-excel")
+        response = HttpResponse(content_type="application/vnd.ms-excel")
         response['Content-Disposition'] = 'attachment; filename=users.xls'
         book.book.save(response)
         return response
@@ -236,7 +236,7 @@ class CorrectorAdmin(admin.ModelAdmin):
     def export_xls(self, request, queryset):
         book = CorrectorXLSBook(correctors=queryset)
         book.write()
-        response = HttpResponse(mimetype="application/vnd.ms-excel")
+        response = HttpResponse(content_type="application/vnd.ms-excel")
         response['Content-Disposition'] = 'attachment; filename=correcteurs.xls'
         book.book.save(response)
         return response

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 017cace44acd550a782ad039652f1d11e3d796e2..33ddf30752c544cc91a34de2de20c0ed8b6a593b 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -35,6 +35,7 @@
 
 import datetime
 import mimetypes
+import os
 from html import escape
 from io import StringIO
 
@@ -53,16 +54,17 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
+from django.contrib.sites.models import Site
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.http.response import StreamingHttpResponse
-from django.shortcuts import redirect, render as django_render
+from django.shortcuts import redirect
 from django.template import Context, RequestContext, loader
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import *
-from django.views.generic.base import *
-from django.views.generic.edit import FormView
+from django.views.generic.base import TemplateResponseMixin, TemplateView, View
+from django.views.generic.detail import DetailView
+from django.views.generic.list import ListView
 from jsonrpc import jsonrpc_method
 from jsonrpc.proxy import ServiceProxy
 
@@ -71,24 +73,26 @@ from teleforma.forms import *
 from teleforma.models.appointment import AppointmentPeriod
 from teleforma.webclass.models import Webclass, WebclassSlot, WebclassRecord
 from teleforma.decorators import access_required
+from teleforma.models.crfpa import Home
 import pages
-import jqchat.models
 from xlwt import Workbook
 
 from cgi import escape
 from cStringIO import StringIO
 from xhtml2pdf import pisa
 
-from ..forms import *
-from ..models import *
-from ..models.appointment import AppointmentPeriod
+from ..decorators import access_required
+from ..models.appointment import Appointment, AppointmentPeriod
+from ..models.core import (Conference, Course, CourseType, Department,
+                           Document, DocumentType, Media, MediaTranscoded,
+                           Organization, Period, Professor, WebClassGroup,
+                           get_user_role)
 from ..webclass.models import Webclass, WebclassRecord
 from .pages import get_page_content
 
-
-def render(request, template, data=None, mimetype=None):
-    return django_render(template, data, context_instance=RequestContext(request),
-                         mimetype=mimetype)
+# def render(request, template, data=None, mimetype=None):
+#     return django_render(template, data, context_instance=RequestContext(request),
+#                          mimetype=mimetype)
 
 
 def format_courses(courses, course=None, queryset=None, types=None):

diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 0f328fc41ca6aa328dd9e848d38199afc37b03c2..f7c5e6e4c0473dfcb7149423197675e3bf96b845 100644 (file)
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -63,10 +63,9 @@ from ..forms import (CorrectorForm, NewsItemForm, UserForm, WriteForm,
                      get_unique_username)
 from ..models.core import Course, CourseType, Document, NamePaginator, Period
 from ..models.crfpa import (IEJ, Discount, NewsItem, Parameters, Payback,
-                            Payment, Profile, Student, Training)
+                            Payment, Profile, Student, Training, months_choices, payment_choices)
 from ..views.core import (PDFTemplateResponseMixin, format_courses,
-                          get_courses, get_periods, months_choices,
-                          payment_choices)
+                          get_courses, get_periods)
 from ..views.profile import ProfileView
 
 ORAL_OPTION_PRICE = 250
@@ -411,7 +410,7 @@ class UsersExportView(UsersView):
         super(UsersExportView, self).get(*args, **kwargs)
         book = UserXLSBook(users = self.users)
         book.write()
-        response = HttpResponse(mimetype="application/vnd.ms-excel")
+        response = HttpResponse(content_type="application/vnd.ms-excel")
         response['Content-Disposition'] = 'attachment; filename=users.xls'
         book.book.save(response)
         return response

diff --git a/teleforma/views/payment.py b/teleforma/views/payment.py
index 4c9c3d33c4aefaa21b1cb91b3b7e1f6eac6d5303..3f34c55f01f9625f5abdffcb9965a95df1866e27 100644 (file)
--- a/teleforma/views/payment.py
+++ b/teleforma/views/payment.py
@@ -2,19 +2,26 @@
 
 import datetime
 import logging
+import os
 import pprint
 import subprocess
 
 from django.conf import settings
+from django.contrib.auth.decorators import login_required
 from django.contrib.sites.shortcuts import get_current_site
 from django.core.exceptions import PermissionDenied
 from django.core.mail import send_mail
+from django.http.response import HttpResponse, HttpResponseRedirect
+from django.shortcuts import render
+from django.template.context import RequestContext
 from django.template.loader import render_to_string
+from django.urls.base import reverse
+from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
+from django.views.generic.detail import DetailView
 
 from ..models.crfpa import Payment
-from ..views.core import *
 
 log = logging.getLogger('payment')
 
@@ -167,7 +174,7 @@ def bank_success(request, merchant_id):
         order_id = res[24]
         payment = Payment.objects.get(pk=order_id)
         if payment.type == 'online' and payment.online_paid and (payment.student.user_id == request.user.pk or request.user.is_superuser):
-            return render_to_response('payment/payment_validate.html',
+            return render(request, 'payment/payment_validate.html',
                                       {'payment': payment, },
                                       context_instance=RequestContext(request))
     return HttpResponseRedirect('/echec-de-paiement')
@@ -185,4 +192,4 @@ def bank_fail(request):
     """
     Display message when a payment failed
     """
-    return render_to_response('payment/payment_fail.html')
+    return render(request, 'payment/payment_fail.html')