Merge branch 'develop' into 'master'

Fix units with videos and activities

See merge request !145

courses_legacy/core/serializers.py

@@ -295,8 +295,8 @@ class LessonSerializer(serializers.ModelSerializer):
                 unit = Unit(lesson=lesson, video=video, **unit_data)
             unit.save()
 
+            activities = []
             if activities_data:
-                activities = []
                 for activity_data in activities_data:
                     activity_id = activity_data.pop('id', None)
                     activity, _ = Activity.objects.get_or_create(id=activity_id)
@@ -313,7 +313,7 @@ class LessonSerializer(serializers.ModelSerializer):
                     activity = Activity.objects.get(id=activity.id)
                     activity.save()
                     activities.append(activity)
-                unit.activities.set(activities)
+            unit.activities.set(activities)
             units.append(unit)
         return units
 

courses_legacy/static/templates/activity_image.html

 <div class="slides question">
-    <span ng-init="$parent.answer.given='image'"></span>
-    <img class="img-responsive" ng-src="{{ currentActivity.image_url }}">
-    <slide-panel></slide-panel>
+    <div class="topbar">
+      <button class="btn btn-sm btn-primary next-activity pull-right" ng-click="next_activity_from_image()" translate>Mark as done</button>
+    </div>
+
+    <div>
+      <span ng-init="$parent.answer.given='image'"></span>
+      <img class="img-responsive" ng-src="{{ currentActivity.image_url }}">
+      <slide-panel></slide-panel>
+    </div>
 </div>

courses_legacy/static/templates/activity_reading.html

 <div class="open-activity">
-
   <div class="topbar">
     <button class="btn btn-sm btn-primary next-activity pull-right" ng-click="next_activity_from_image()" translate>Mark as done</button>
   </div>
@@ -8,7 +7,6 @@
       <span ng-bind-html="getReadingActivityHtml()"></span>
       <slide-panel></slide-panel>
   </div>
-
 </div>
 
 <!--<div class="submit">-->