Add link to content on facilitator dashboard

Author: dirkcuys

courses/db.py

@@ -13,6 +13,9 @@ class Course(models.Model):
     creator_uri = models.CharField(max_length=256)
     based_on = models.ForeignKey('courses.Course', models.SET_NULL, related_name='derived_courses', blank=True, null=True)
 
+    def __str__(self):
+        return self.title
+
 
 class CourseContent(models.Model):
     course = models.ForeignKey(Course, models.CASCADE, related_name='content')

courses/views.py

@@ -118,8 +118,7 @@ def show_course( request, course_id, slug=None ):
     if slug != course['slug']:
         return course_slug_redirect( request, course_id)
 
-    context = { }
-    context = _populate_course_context(request, course_id, context)
+    context = _populate_course_context(request, course_id, {})
     context['about_active'] = True
 
     if context['organizer']:

studygroups/views/facilitate.py

@@ -91,6 +91,17 @@ def view_study_group(request, study_group_id):
         context['expand_meeting'] = meeting_number
         context['meeting_rating'] = rating
 
+    if study_group.course_content:
+        import courses.models
+        course_uri = courses.models.course_id2uri(study_group.course_content.pk)
+        sections = courses.models.get_course_content(course_uri)
+        if len(sections) > 1:
+            context['content_link'] = reverse(
+                'studygroups_content_view',
+                args=(study_group.pk, sections[1]['id'],) #TODO skipping nr 0
+            )
+
+
     return render(request, 'studygroups/view_study_group.html', context)
 
 

studygroups/views/learner.py

@@ -299,10 +299,11 @@ def get(self, request, *args, **kwargs):
             import courses.models
             course_uri = courses.models.course_id2uri(study_group.course_content.pk)
             sections = courses.models.get_course_content(course_uri)
-            context['content_link'] = reverse(
-                'studygroups_content_view',
-                args=(study_group.pk, sections[1]['id'],) #TODO skipping nr 0
-            )
+            if len(sections) > 1:
+                context['content_link'] = reverse(
+                    'studygroups_content_view',
+                    args=(study_group.pk, sections[1]['id'],) #TODO skipping nr 0
+                )
 
 
         meetings = study_group.meeting_set.active().order_by('meeting_date', 'meeting_time')

templates/studygroups/view_study_group.html

@@ -59,6 +59,7 @@ <h1>{% if study_group.draft %}[DRAFT] {% endif %}{{study_group.name}}</h1>
         <div class="col-sm-9 offset-sm-3">
           <a class="p2pu-btn btn btn-primary" href="{% url 'studygroups_edit_study_group' study_group.id %}">{% trans "Edit" %}</a>
           <a class="p2pu-btn btn btn-primary" href="{{ signup_url }}">{% trans "View" %}</a>
+          {% if content_link %}<a class="p2pu-btn btn btn-primary" href="{{ content_link }}">{% trans "View content" %}</a>{% endif %}
           <a class="p2pu-btn btn btn-primary" href="{% url 'studygroups_meeting_create' study_group.id %}">{% trans "Add meeting" %}</a>
           {% if study_group.signup_open %}
           <a class="p2pu-btn btn btn-primary" href="{% url 'studygroups_studygroup_toggle_signup' study_group.id %}">{% trans "Close signup" %}</a>