added functional notifications for poll, links and forum #207

fbormann
1 parent f31dfec9
Showing 5 changed files with 18 additions and 10 deletions Show diff stats
core/mixins.py
courses/views.py
forum/views.py
links/views.py
poll/views.py
@@ -51,13 +51,13 @@ class NotificationMixin(object):
 		if action.exists():
 			action = action[0]
 		else:
-			action = Action(name = self.action_slug)
+			action = Action(name = action_slug)
 			action.save()
 		if resource.exists():
 			resource = resource[0]
 		else:
-			resource = Resource(name = self.resource_name, url= resource_link)
+			resource = Resource(name = resource_name, url= resource_link)
 			resource.save()
 		action_resource = Action_Resource.objects.filter(action = action, resource = resource)
@@ -19,6 +19,8 @@ from users.models import User
 from files.forms import FileForm
 from files.models import TopicFile
+from django.urls import reverse
+
 from datetime import date
 class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
@@ -430,7 +432,7 @@ class CreateTopicView(LoginRequiredMixin, HasRoleMixin, NotificationMixin, gener
 		self.object.save()
 		action = super(CreateTopicView, self).createorRetrieveAction("create Topic")
 		super(CreateTopicView, self).createNotification("Topic "+ self.object.name + " was created", 
-			resource_name=self.object.name, resource_link= 'topics/'+self.object.slug,
+			resource_name=self.object.name, resource_link= reverse('course:view_topic',args=[self.object.slug]),
 			 actor=self.request.user, users = self.object.subject.course.students.all() )
 		return super(CreateTopicView, self).form_valid(form)
@@ -13,6 +13,7 @@ from core.mixins import NotificationMixin
 from core.models import Action, Resource
 from .forms import ForumForm, PostForm, PostAnswerForm
+from django.urls import reverse
 """
 	Forum Section
@@ -57,7 +58,7 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView, NotificationM
 		action = super(CreateForumView, self).createorRetrieveAction("create Topic")
 		super(CreateForumView, self).createNotification("Forum "+ self.object.name + " was created", 
-			resource_name=self.object.name, resource_link= 'topics/'+self.object.slug,
+			resource_name=self.object.name, resource_link= reverse('course:forum:view', args=[self.object.slug]),
 			 actor=self.request.user, users = self.object.topic.subject.students.all() )
 		return self.success_url
@@ -10,9 +10,11 @@ from rolepermissions.mixins import HasRoleMixin
 from courses.models import Topic
 from .models import Link
 from .forms import *
+from core.mixins import NotificationMixin
+from django.urls import reverse
 # Create your views here.
-class CreateLink(LoginRequiredMixin, HasRoleMixin, generic.CreateView):
+class CreateLink(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.CreateView):
     allowed_roles = ['professor', 'system_admin']
     template_name = 'links/create_link.html'
     form_class = CreateLinkForm
@@ -24,9 +26,12 @@ class CreateLink(LoginRequiredMixin, HasRoleMixin, generic.CreateView):
         topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
         self.object.topic = topic
         messages.success(self.request, _('Link created successfully!'))
-        #messages.error(self.request, _("An error occurred when trying to create the link"))
+       
         self.object.save()
-        #return self.success_url
+        super(CreateLink, self).createNotification(message="created a Link at "+ self.object.topic.name, actor=self.request.user,
+            resource_name=self.object.name, resource_link= reverse('course:view_topic', args=[self.object.topic.slug]), 
+            users=self.object.topic.subject.students.all())
+
         return self.get_success_url()
     def get_context_data(self,**kwargs):
         context = {}
@@ -43,7 +48,7 @@ def deleteLink(request,linkname):
     link.delete()
     template_name = 'links/delete_link.html'
     messages.success(request,_("Link deleted Successfully!"))
-    #messages.error(request, _("An error occurred when trying to delete the link"))
+   
     return redirect('course:manage')
 def render_link(request, id):
@@ -73,8 +73,8 @@ class CreatePoll(LoginRequiredMixin,HasRoleMixin, NotificationMixin,generic.Crea
 		self.object.name = str(self.object)
 		self.object.save()
-		super(CreatePoll, self).createNotification(message="created a Poll "+ self.object.name, actor=self.request.user,
-			resource_name=self.object.name, resource_link= reverse('course:poll:view_poll', args=[self.object.slug]), 
+		super(CreatePoll, self).createNotification(message="created a Poll at "+ self.object.topic.name, actor=self.request.user,
+			resource_name=self.object.name, resource_link= reverse('course:view_topic', args=[self.object.topic.slug]), 
 			users=self.object.topic.subject.students.all())
 		for key in self.request.POST:
 			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'limit_date' and key != 'all_students' and key != 'students'):
	@@ -51,13 +51,13 @@ class NotificationMixin(object):		@@ -51,13 +51,13 @@ class NotificationMixin(object):
51	if action.exists():	51	if action.exists():
52	action = action[0]	52	action = action[0]
53	else:	53	else:
54	- action = Action(name = self.action_slug)	54	+ action = Action(name = action_slug)
55	action.save()	55	action.save()
56		56
57	if resource.exists():	57	if resource.exists():
58	resource = resource[0]	58	resource = resource[0]
59	else:	59	else:
60	- resource = Resource(name = self.resource_name, url= resource_link)	60	+ resource = Resource(name = resource_name, url= resource_link)
61	resource.save()	61	resource.save()
62		62
63	action_resource = Action_Resource.objects.filter(action = action, resource = resource)	63	action_resource = Action_Resource.objects.filter(action = action, resource = resource)