From 71771d318328502a0747ba3eb0ae8b2315f91307 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 9 Feb 2020 21:54:45 +0100
Subject: [PATCH] Benachrichtigungen noch verlinkt und Default-Link auf
 Benachrichtigungen gesetzt

---
 users/__pycache__/signals.cpython-38.pyc | Bin 3199 -> 3226 bytes
 users/signals.py                         |   2 +-
 users/templates/users/base.html          |   7 +++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc
index 67bc5a779dbb03c419efab00e48231339004b5e3..63ab878c59c541fe861f2ec39ee59aac69be7723 100644
GIT binary patch
delta 238
zcmew_F-wv+l$V!_0SM0KI>d!;<c(uv)SR5dHl0y#GYfkyBby#js>pP5JI4e@zsVAu
zvOL>>0yRu2jFJpRn<hJQiZf1{9LZV7QNx(UlET-^GWj;AQGgLhlQD=e0TE^(!W=|c
zfCx(<;Z|e?B%`<z(^K=3EAvvzi#1t_bV0IU3-y7lTb!vmsky0nC7CIc-MEaToItY9
sAVL5{c!LOj5aBX;5|^C-#GxR*FNpA&{D8}gQDU<;Hwz=s<pw<d0N=<nLjV8(

delta 211
zcmbOw`Co!Jl$V!_0SNYHImFp*<c(uvTsb+1Z91d=W)}8ZMmBw*RFT=_c8&>*{*xs*
zWqCFM1!|a57$q5s)=hTg6ld(49LZV7lET-^Jo!GSk)<(6g9(T*1rg>T!U9BCf(R=h
z;Z|e~B%`<z(^K=3EAvvzi;HxD0+SQDjHH}Fid;a10EqAb5&R&+b@Ey+I{}DmKzu(C
W;XC;^mlvbRW;bpYMxgV&dHeyAU@aN|

diff --git a/users/signals.py b/users/signals.py
index 0fddb1c..cfadaeb 100644
--- a/users/signals.py
+++ b/users/signals.py
@@ -111,5 +111,5 @@ def save_news(sender, instance, **kwargs):
 					)
 
 			if(user.profile.news_push):
-				newnotification = UserNotification(touser=user, notificationtext="Neue Agenturnews: " + instance.name, notificationtype="agencynews")
+				newnotification = UserNotification(touser=user, notificationtext="Neue Agenturnews: " + instance.name, notificationtype="agencynews", elementid=instance.pk)
 				newnotification.save()
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index baf8a9d..43d95d0 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -490,6 +490,8 @@ getDimensions();
 */
 newunknownotificationscounter = 0;
 
+
+
 function loadUnsendNotifications(){
  $.ajax(
   {
@@ -503,7 +505,7 @@ function loadUnsendNotifications(){
         notifications = data['unknownnotification'];
         var i = 0;
         for (var key in notifications) {
-          $("#notification_items").append('<a id="notifyid_'+notifications[i]['not_id']+'" class="dropdown-item d-flex align-items-center" onclick="removeNotification('+notifications[i]['not_id']+')"><div><div class="small text-gray-500">'+notifications[i]['date']+'</div>'+notifications[i]['text']+'</div></a>')
+          $("#notification_items").append('<a href="/'+notifications[i]['elelink']+'" id="notifyid_'+notifications[i]['not_id']+'" class="dropdown-item d-flex align-items-center"><div><div class="small text-gray-500">'+notifications[i]['date']+'</div>'+notifications[i]['text']+'</div></a>')
           i = i + 1;
           newunknownotificationscounter = newunknownotificationscounter + 1;
         } 
@@ -530,7 +532,7 @@ function loadUnviewnNotifications(){
         i = 0;
         for (var key in notifications) {
           if(newunknownotificationscounter <= 5){
-            $("#notification_items").append('<a id="notifyid_'+notifications[i]['not_id']+'" class="dropdown-item d-flex align-items-center" onclick="removeNotification('+notifications[i]['not_id']+')"><div><div class="small text-gray-500">'+notifications[i]['date']+'</div>'+notifications[i]['text']+'</div></a>')
+            $("#notification_items").append('<a href="/'+notifications[i]['elelink']+'" id="notifyid_'+notifications[i]['not_id']+'" class="dropdown-item d-flex align-items-center"><div><div class="small text-gray-500">'+notifications[i]['date']+'</div>'+notifications[i]['text']+'</div></a>')
             i = i + 1;
           }
         }         
@@ -559,6 +561,7 @@ function removeNotification(notifyid){
 }
 
 $(document).ready(function(){
+  console.log(); 
   $("#notification_items").html("");
   loadUnsendNotifications();
   loadUnviewnNotifications();