From a18628bd4e9f1844019c5531a26a646df2d545c1 Mon Sep 17 00:00:00 2001
From: fbormann <felipe.bormann@gmail.com>
Date: Wed, 14 Sep 2016 01:30:12 -0300
Subject: [PATCH] Finally, I have finished the issue, completed the cycle and added url support, link now connects to another url and add read to True #41

---
 amadeus/settings.py      |  4 ++--
 app/views.py             |  2 +-
 core/mixins.py           |  3 ++-
 core/templates/base.html |  6 +++---
 core/urls.py             |  1 +
 core/views.py            | 10 +++++++++-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/amadeus/settings.py b/amadeus/settings.py
index 6773eaa..ba3c3a3 100644
--- a/amadeus/settings.py
+++ b/amadeus/settings.py
@@ -92,8 +92,8 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': 'amadeus',
-        'USER': 'amadeus_admin',
-        'PASSWORD': 'amadeus',
+        'USER': 'postgres',
+        'PASSWORD': 'felipe',
         'HOST': '127.0.0.1',
         'PORT': '5432',
     }
diff --git a/app/views.py b/app/views.py
index 2acb45c..be009f0 100644
--- a/app/views.py
+++ b/app/views.py
@@ -38,7 +38,7 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
 		if self.request.is_ajax():
 			self.template_name = "home_admin_content.html"
 
-		#super(AppIndex, self).createNotification("teste", not_resource="home", resource_link="users")
+		super(AppIndex, self).createNotification("teste", not_resource="home", resource_link="/register")
 		
 		notifications = Notification.objects.filter(user= self.request.user, read=False)
 		context['notifications'] = notifications
diff --git a/core/mixins.py b/core/mixins.py
index 8f675d0..8fc2524 100644
--- a/core/mixins.py
+++ b/core/mixins.py
@@ -47,7 +47,7 @@ class NotificationMixin(object):
 	def createNotification(self, message='', actor=None, users = User.objects.all(), not_action = '', not_resource='', resource_link=''): #the default will be a broadcast
 		action = Action.objects.filter(name = self.not_action)
 		resource = Resource.objects.filter(name = not_resource)
-		
+		print(resource_link)
 		if action.exists():
 			action = action[0]
 		else:
@@ -58,6 +58,7 @@ class NotificationMixin(object):
 			resource = resource[0]
 		else:
 			resource = Resource(name = self.not_resource, link= resource_link)
+			print(resource)
 			resource.save()
 
 		action_resource = Action_Resource.objects.filter(action = action, resource = resource)
diff --git a/core/templates/base.html b/core/templates/base.html
index 1a2752c..56e7d32 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -53,13 +53,13 @@
 			              		<div class="navbar-collapse collapse navbar-responsive-collapse">
 			                		<ul class="nav navbar-nav navbar-right notifications">
 			                  			 <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">         
-						                    <a href="../user/profile_user.html" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-bell-o" aria-hidden="true"></i></a>
+						                    <a  class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-bell-o" aria-hidden="true"></i></a>
 						                     <ul class="dropdown-menu">
 						                     <li class="dropdown-header">Notifications</li>
 						                     	{% for notification in notifications  %}
 						                     		{% if notification.actor %} <!-- if the notification has a user-->
 						                     			<li>
-								                          <a href="{{ notification.action_resource.resource.link }}"><div class="list-group-item">
+								                          <a href="{% url 'core:notification_read' notification.id %}"><div class="list-group-item">
 								                          <div class="row-picture">
 								                            <img class="circle" src="http://lorempixel.com/56/56/people/1" alt="icon">
 								                            <div class="least-content pull-right">{{ notification.datetime }}</div>
@@ -72,7 +72,7 @@
 								                        </li>
 						                     		{% else %}
 						                     			 <li>
-								                            <a href="{{ notification.action_resource.resource.link }}">
+								                            <a href="{% url 'core:notification_read' notification.id %}">
 								                                <div class="list-group-item">
 								                                  <div class="row-action-primary">
 								                                    <i class="material-icons">folder</i>
diff --git a/core/urls.py b/core/urls.py
index bf4b1be..35de1eb 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -9,4 +9,5 @@ urlpatterns = [
 	url(r'^register/$', views.RegisterUser.as_view(), name='register'),
 	url(r'^remember_password/$', views.remember_password, name='remember_password'),
     url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
+    url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read')
 ]
diff --git a/core/views.py b/core/views.py
index 09ad5ab..794310f 100644
--- a/core/views.py
+++ b/core/views.py
@@ -10,7 +10,7 @@ from django.http import HttpResponse
 from django.core.mail import send_mail,BadHeaderError
 from django.conf import settings
 from core.mixins import NotificationMixin
-
+from .models import Notification
 from rolepermissions.shortcuts import assign_role
 
 from .forms import RegisterUserForm
@@ -87,6 +87,14 @@ def login(request):
 	return render(request,"index.html",context)
 
 
+
+def processNotification(self, notificationId):
+	notification = Notification.objects.get(id= notificationId)
+	notification.read = True
+	notification.save()
+
+	return redirect(notification.action_resource.resource.link)
+
 # class LoginClass(LoginView):
 # 	template_name='index.html'
 #
--
libgit2 0.21.2