]> git.parisson.com Git - teleforma.git/commitdiff
auto add seminars whrn auditor.conferences, filter 3 first steps for them
authoryomguy <yomguy@parisson.com>
Thu, 21 Feb 2013 17:18:28 +0000 (18:18 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 21 Feb 2013 17:18:28 +0000 (18:18 +0100)
teleforma/models/pro.py
teleforma/templates/teleforma/seminar_detail.html
teleforma/views/pro.py

index 908bc312da7572536b350e4df58fd796307e69f5..0b4c7c78fe89fe96bcd241b36e642fcacf42231e 100755 (executable)
@@ -264,6 +264,16 @@ class Auditor(models.Model):
         except:
             return ''
 
+    def clean(self):
+        seminars = self.seminars.all()
+        for conference in self.conferences.all():
+            try:
+                seminar = conference.seminar.get()
+                if not seminar in seminars:
+                    self.seminars.add(seminar)
+            except:
+                continue
+
     class Meta(MetaCore):
         db_table = app_label + '_' + 'auditor'
         verbose_name = _('Auditor')
index d476062d3263a4b15cdb7454026f0fd19379b7a0..ac5e223703e9147eb0019fd942cf341b46f39feb 100644 (file)
@@ -99,6 +99,8 @@ $(function () {
        </div>
       {% endwith %}
 
+   {% if not seminar.conference in user.auditor.get.conferences.all %}
+
      {% with seminar.question as questions %}
        <div class="course_content">
         <div class="course_subtitle">
@@ -138,6 +140,8 @@ $(function () {
        </div>
      {% endif %}
 
+   {% endif %}
+
   {% endblock course_content %}
 
       </div>
index ab3bbc8cc92d71a20de990acddf6b8d775235bf6..16a14886d96a386d97bbcd2b68e792dc363f9fbd 100644 (file)
@@ -128,6 +128,7 @@ class SeminarView(SeminarAccessMixin, DetailView):
         context = super(SeminarView, self).get_context_data(**kwargs)
         seminar = context['seminar']
         user = self.request.user
+
         progress = seminar_progress(user, seminar)
         validated = seminar_validated(user, seminar)
         context['seminar_progress'] = progress