Download as
Browse Code »

Commit 516b536dbc54b6806418a11965f3488daa17d0f2

Authored by Zambom
1 parent 56a21eaa
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adding students to destination subject on restore

Showing 6 changed files with 12 additions and 11 deletions   Show diff stats
file_link/serializers.py
  Diff comments   View file @516b536
@@ -230,6 +230,7 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer): @@ -230,6 +230,7 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer):
230 file_link.tags.add(tag) 230 file_link.tags.add(tag)
231 231
232 students = data["students"] 232 students = data["students"]
  233 + subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
233 234
234 for student_data in students: 235 for student_data in students:
235 logs = student_data["get_items"] 236 logs = student_data["get_items"]
@@ -274,11 +275,10 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer): @@ -274,11 +275,10 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer):
274 Log.objects.create(**log) 275 Log.objects.create(**log)
275 276
276 file_link.students.add(student) 277 file_link.students.add(student)
  278 + subject.students.add(student)
277 279
278 groups = data["groups"] 280 groups = data["groups"]
279 281
280 - subject = get_object_or_404(Subject, slug = self.context.get("subject", None))  
281 -  
282 for group_data in groups: 282 for group_data in groups:
283 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"]) 283 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
284 284
goals/serializers.py
  Diff comments   View file @516b536
@@ -185,6 +185,7 @@ class CompleteGoalSerializer(serializers.ModelSerializer): @@ -185,6 +185,7 @@ class CompleteGoalSerializer(serializers.ModelSerializer):
185 goals.tags.add(tag) 185 goals.tags.add(tag)
186 186
187 students = data["students"] 187 students = data["students"]
  188 + subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
188 189
189 for student_data in students: 190 for student_data in students:
190 logs = student_data["get_items"] 191 logs = student_data["get_items"]
@@ -229,11 +230,10 @@ class CompleteGoalSerializer(serializers.ModelSerializer): @@ -229,11 +230,10 @@ class CompleteGoalSerializer(serializers.ModelSerializer):
229 Log.objects.create(**log) 230 Log.objects.create(**log)
230 231
231 goals.students.add(student) 232 goals.students.add(student)
  233 + subject.students.add(student)
232 234
233 groups = data["groups"] 235 groups = data["groups"]
234 236
235 - subject = get_object_or_404(Subject, slug = self.context.get("subject", None))  
236 -  
237 for group_data in groups: 237 for group_data in groups:
238 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"]) 238 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
239 239
links/serializers.py
  Diff comments   View file @516b536
@@ -167,6 +167,7 @@ class CompleteLinkSerializer(serializers.ModelSerializer): @@ -167,6 +167,7 @@ class CompleteLinkSerializer(serializers.ModelSerializer):
167 link.tags.add(tag) 167 link.tags.add(tag)
168 168
169 students = data["students"] 169 students = data["students"]
  170 + subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
170 171
171 for student_data in students: 172 for student_data in students:
172 logs = student_data["get_items"] 173 logs = student_data["get_items"]
@@ -211,11 +212,10 @@ class CompleteLinkSerializer(serializers.ModelSerializer): @@ -211,11 +212,10 @@ class CompleteLinkSerializer(serializers.ModelSerializer):
211 Log.objects.create(**log) 212 Log.objects.create(**log)
212 213
213 links.students.add(student) 214 links.students.add(student)
  215 + subject.students.add(student)
214 216
215 groups = data["groups"] 217 groups = data["groups"]
216 218
217 - subject = get_object_or_404(Subject, slug = self.context.get("subject", None))  
218 -  
219 for group_data in groups: 219 for group_data in groups:
220 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"]) 220 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
221 221
pdf_file/serializers.py
  Diff comments   View file @516b536
@@ -224,6 +224,7 @@ class CompletePDFFileSerializer(serializers.ModelSerializer): @@ -224,6 +224,7 @@ class CompletePDFFileSerializer(serializers.ModelSerializer):
224 pdf.tags.add(tag) 224 pdf.tags.add(tag)
225 225
226 students = data["students"] 226 students = data["students"]
  227 + subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
227 228
228 for student_data in students: 229 for student_data in students:
229 logs = student_data["get_items"] 230 logs = student_data["get_items"]
@@ -268,10 +269,10 @@ class CompletePDFFileSerializer(serializers.ModelSerializer): @@ -268,10 +269,10 @@ class CompletePDFFileSerializer(serializers.ModelSerializer):
268 Log.objects.create(**log) 269 Log.objects.create(**log)
269 270
270 pdf.students.add(student) 271 pdf.students.add(student)
  272 + subject.students.add(student)
271 273
272 groups = data["groups"] 274 groups = data["groups"]
273 275
274 - subject = get_object_or_404(Subject, slug = self.context.get("subject", None))  
275 276
276 for group_data in groups: 277 for group_data in groups:
277 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"]) 278 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
webpage/serializers.py
  Diff comments   View file @516b536
@@ -167,6 +167,7 @@ class CompleteWebpageSerializer(serializers.ModelSerializer): @@ -167,6 +167,7 @@ class CompleteWebpageSerializer(serializers.ModelSerializer):
167 webpage.tags.add(tag) 167 webpage.tags.add(tag)
168 168
169 students = data["students"] 169 students = data["students"]
  170 + subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
170 171
171 for student_data in students: 172 for student_data in students:
172 logs = student_data["get_items"] 173 logs = student_data["get_items"]
@@ -212,11 +213,10 @@ class CompleteWebpageSerializer(serializers.ModelSerializer): @@ -212,11 +213,10 @@ class CompleteWebpageSerializer(serializers.ModelSerializer):
212 Log.objects.create(**log) 213 Log.objects.create(**log)
213 214
214 webpage.students.add(student) 215 webpage.students.add(student)
  216 + subject.students.add(student)
215 217
216 groups = data["groups"] 218 groups = data["groups"]
217 219
218 - subject = get_object_or_404(Subject, slug = self.context.get("subject", None))  
219 -  
220 for group_data in groups: 220 for group_data in groups:
221 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"]) 221 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
222 222
youtube_video/serializers.py
  Diff comments   View file @516b536
@@ -169,6 +169,7 @@ class CompleteYTVideoSerializer(serializers.ModelSerializer): @@ -169,6 +169,7 @@ class CompleteYTVideoSerializer(serializers.ModelSerializer):
169 ytvideo.tags.add(tag) 169 ytvideo.tags.add(tag)
170 170
171 students = data["students"] 171 students = data["students"]
  172 + subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
172 173
173 for student_data in students: 174 for student_data in students:
174 logs = student_data["get_items"] 175 logs = student_data["get_items"]
@@ -213,11 +214,10 @@ class CompleteYTVideoSerializer(serializers.ModelSerializer): @@ -213,11 +214,10 @@ class CompleteYTVideoSerializer(serializers.ModelSerializer):
213 Log.objects.create(**log) 214 Log.objects.create(**log)
214 215
215 ytvideo.students.add(student) 216 ytvideo.students.add(student)
  217 + subject.students.add(student)
216 218
217 groups = data["groups"] 219 groups = data["groups"]
218 220
219 - subject = get_object_or_404(Subject, slug = self.context.get("subject", None))  
220 -  
221 for group_data in groups: 221 for group_data in groups:
222 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"]) 222 g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
223 223