From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 20 Jul 2014 15:54:56 +0000 (+0200)
Subject: try bugfix
X-Git-Tag: 2.8.1-pro~282^2~135
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8e1c7df4445eb432c7d16c81bc210601be3d5748;p=teleforma.git

try bugfix
---

diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html
index c0235adb..61bf4da4 100644
--- a/teleforma/templates/teleforma/seminar_detail.html
+++ b/teleforma/templates/teleforma/seminar_detail.html
@@ -37,6 +37,7 @@ $(function () {
 {% if user.is_staff %}
 <script type="text/javascript">
 
+
 var seminarUtils = {
         publish : function(id){
             var p = $('#publish');
@@ -53,15 +54,21 @@ var seminarUtils = {
                 });
          },
 
-        ping : function(id, username){
-            json([id, username],'teleforma.seminar_ping');
+        load : function(id, username){
+            json([id, username],'teleforma.seminar_load');
+         },
+
+        unload : function(id, username){
+            json([id, username],'teleforma.seminar_unload');
          },
 
         }
 
+var f = seminarUtils;
+
 $(window).ready(function(){
-    var f = seminarUtils;
-    f.ping('{{seminar.id}}','{{user.username}}');
+
+    f.load('{{seminar.id}}','{{user.username}}');
 
     var p = $('#publish');
     p.unbind('click').click(function() {
@@ -75,13 +82,12 @@ $(window).ready(function(){
             }
         });
 
+      $(window).unload(function(){
+        f.unload('{{seminar.id}}','{{user.username}}');
+      });
 
-    });
 
-$(window).unload(function(){
-      var g = seminarUtils;
-      g.ping('{{seminar.id}}','{{user.username}}');
-      });
+    });
 
 
 </script>
diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index 942524db..a3b96bf5 100644
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@ -97,7 +97,7 @@ def render_to_pdf(request, template, context, filename=None, encoding='utf-8',
 
 
 def set_revision(user, seminar):
-    date_filter = datetime.datetime(2014,7,19)
+
     revisions = SeminarRevision.objects.filter(seminar=seminar, user=user,
                                                 date__gte=date_filter, date_modified=None)
     if revisions:
@@ -110,6 +110,7 @@ def set_revision(user, seminar):
 
 class SeminarAccessMixin(object):
 
+
     def render_to_response(self, context):
         seminar = context['seminar']
         if not seminar in all_seminars(self.request)['all_seminars']:
@@ -117,11 +118,27 @@ class SeminarAccessMixin(object):
             return redirect('teleforma-desk')
         return super(SeminarAccessMixin, self).render_to_response(context)
 
-    @jsonrpc_method('teleforma.seminar_ping')
-    def seminar_ping(request, id, username):
+    @jsonrpc_method('teleforma.seminar_load')
+    def seminar_load(request, id, username):
+        date_filter = datetime.datetime(2014,7,19)
         seminar = Seminar.objects.get(id=id)
         user = User.objects.get(username=username)
-        set_revision(user, seminar)
+        r = SeminarRevision(seminar=seminar, user=user)
+        r.save()
+        # set_revision(user, seminar)
+
+    @jsonrpc_method('teleforma.seminar_unload')
+        def seminar_unload(request, id, username):
+        date_filter = datetime.datetime(2014,7,19)
+        seminar = Seminar.objects.get(id=id)
+        user = User.objects.get(username=username)
+        revisions = SeminarRevision.objects.filter(seminar=seminar, user=user,
+                                                date__gte=date_filter, date_modified=None)
+        if revisions:
+            r = revisions[0]
+            r.date_modified = datetime.datetime.now()
+        r.save()
+        # set_revision(user, seminar)
 
 class SeminarView(SeminarAccessMixin, DetailView):