Download as
Browse Code »

Commit dfde9672333b7f03fdb8cea0791fcc9d5bbb7366

Authored by fbormann
1 parent b3fb9eed
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

modified notifications, fixed resource.url for post Model

Showing 3 changed files with 17 additions and 8 deletions   Show diff stats
core/mixins.py
  Diff comments   View file @dfde967
@@ -56,10 +56,13 @@ class NotificationMixin(object): @@ -56,10 +56,13 @@ class NotificationMixin(object):
56 56
57 if resource.exists(): 57 if resource.exists():
58 resource = resource[0] 58 resource = resource[0]
  59 + resource.url = resource_link
  60 + resource.save()
59 else: 61 else:
60 resource = Resource(name = resource_name, url= resource_link) 62 resource = Resource(name = resource_name, url= resource_link)
61 resource.save() 63 resource.save()
62 64
  65 +
63 action_resource = Action_Resource.objects.filter(action = action, resource = resource) 66 action_resource = Action_Resource.objects.filter(action = action, resource = resource)
64 67
65 if action_resource.exists(): 68 if action_resource.exists():
courses/views.py
  Diff comments   View file @dfde967
@@ -384,8 +384,7 @@ class TopicsView(LoginRequiredMixin, generic.ListView): @@ -384,8 +384,7 @@ class TopicsView(LoginRequiredMixin, generic.ListView):
384 topic = get_object_or_404(Topic, slug = self.kwargs.get('slug')) 384 topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
385 subject = topic.subject 385 subject = topic.subject
386 topics_q = Topic.objects.filter(subject = subject, visible=True) 386 topics_q = Topic.objects.filter(subject = subject, visible=True)
387 - #if (self.request.user in subject.professors.all() or has_role(self.request.user,'system_admin')):  
388 - #context = subject.topics.all() <- Change it By Activities 387 +
389 return topics_q 388 return topics_q
390 389
391 def get_context_data(self, **kwargs): 390 def get_context_data(self, **kwargs):
@@ -393,14 +392,13 @@ class TopicsView(LoginRequiredMixin, generic.ListView): @@ -393,14 +392,13 @@ class TopicsView(LoginRequiredMixin, generic.ListView):
393 context = super(TopicsView, self).get_context_data(**kwargs) 392 context = super(TopicsView, self).get_context_data(**kwargs)
394 activitys = Activity.objects.filter(topic__name = topic.name) 393 activitys = Activity.objects.filter(topic__name = topic.name)
395 students_activit = User.objects.filter(activities__in = Activity.objects.all()) 394 students_activit = User.objects.filter(activities__in = Activity.objects.all())
396 - # page_user = User.objects.get(id= self.kwargs['user_id']) 395 +
397 context['topic'] = topic 396 context['topic'] = topic
398 context['subject'] = topic.subject 397 context['subject'] = topic.subject
399 context['activitys'] = activitys 398 context['activitys'] = activitys
400 context['students_activit'] = students_activit 399 context['students_activit'] = students_activit
401 context['form'] = ActivityForm 400 context['form'] = ActivityForm
402 - # context['user_activity_id'] = Activity.objects.filter(students__id = self.kwargs['students_id'])  
403 - # context['page_user'] = page_user 401 +
404 return context 402 return context
405 403
406 404
@@ -467,7 +465,7 @@ class UpdateTopicView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView): @@ -467,7 +465,7 @@ class UpdateTopicView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
467 context['subjects'] = topic.subject.course.subjects.all() 465 context['subjects'] = topic.subject.course.subjects.all()
468 return context 466 return context
469 467
470 -class CreateSubjectView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView): 468 +class CreateSubjectView(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.edit.CreateView):
471 469
472 allowed_roles = ['professor', 'system_admin'] 470 allowed_roles = ['professor', 'system_admin']
473 login_url = reverse_lazy("core:home") 471 login_url = reverse_lazy("core:home")
@@ -494,6 +492,11 @@ class CreateSubjectView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateVie @@ -494,6 +492,11 @@ class CreateSubjectView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateVie
494 self.object.course = course 492 self.object.course = course
495 self.object.save() 493 self.object.save()
496 self.object.professors.add(self.request.user) 494 self.object.professors.add(self.request.user)
  495 + if self.object.visible:
  496 + print(reverse('course:view_subject', args=[self.object.slug]))
  497 + super(CreateSubjectView, self).createNotification( " created subject " + self.object.name,
  498 + resource_slug = self.object.slug, actor=self.request.user, users= self.object.course.students.all(),
  499 + resource_link = reverse('course:view_subject', args=[self.object.slug]))
497 500
498 return super(CreateSubjectView, self).form_valid(form) 501 return super(CreateSubjectView, self).form_valid(form)
499 502
forum/views.py
  Diff comments   View file @dfde967
@@ -163,8 +163,10 @@ class CreatePostView(LoginRequiredMixin, generic.edit.CreateView, NotificationMi @@ -163,8 +163,10 @@ class CreatePostView(LoginRequiredMixin, generic.edit.CreateView, NotificationMi
163 self.object.user = self.request.user 163 self.object.user = self.request.user
164 164
165 self.object.save() 165 self.object.save()
166 - super(CreatePostView, self).createNotification(self.object.user.username + " posted on " + self.object.forum,name,  
167 - resource_slug = self.object.forum.slug, actor=self.request.user, users= self.object.forum.topic.subject.students.all()) 166 +
  167 + super(CreatePostView, self).createNotification(" posted on " + self.object.forum.name,
  168 + resource_slug = self.object.forum.slug, actor=self.request.user, users= self.object.forum.topic.subject.students.all(),
  169 + resource_link = reverse('course:forum:view', args=[self.object.forum.slug]))
168 170
169 return super(CreatePostView, self).form_valid(form) 171 return super(CreatePostView, self).form_valid(form)
170 172
@@ -266,6 +268,7 @@ class CreatePostAnswerView(LoginRequiredMixin, generic.edit.CreateView): @@ -266,6 +268,7 @@ class CreatePostAnswerView(LoginRequiredMixin, generic.edit.CreateView):
266 268
267 self.object.save() 269 self.object.save()
268 270
  271 +
269 return super(CreatePostAnswerView, self).form_valid(form) 272 return super(CreatePostAnswerView, self).form_valid(form)
270 273
271 def get_success_url(self): 274 def get_success_url(self):