From 0529367e0cc120d86fba34465cbb2c525206c52f Mon Sep 17 00:00:00 2001
From: Holger Trampe
Date: Mon, 16 Dec 2019 23:17:40 +0100
Subject: [PATCH] png suche um quicklinks erweitert
---
.gitignore | 3 ++-
media/agencymain/linkdefault.jpg | Bin 2884 -> 0 bytes
media/agencymain/linkdefault.png | Bin 0 -> 3313 bytes
quicklinks/__pycache__/models.cpython-38.pyc | Bin 1371 -> 1375 bytes
quicklinks/models.py | 4 ++--
.../templates/quicklinks/ql_update.html | 2 +-
users/__pycache__/views.cpython-38.pyc | Bin 14946 -> 15082 bytes
users/templates/users/searchres.html | 10 ++++++++++
users/views.py | 4 +++-
9 files changed, 18 insertions(+), 5 deletions(-)
delete mode 100644 media/agencymain/linkdefault.jpg
create mode 100644 media/agencymain/linkdefault.png
diff --git a/.gitignore b/.gitignore
index ed44c37..e605367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
media/agencymain/*
!media/agencymain/default.jpg
-!media/agencymain/linkdefault.jpg
+!media/agencymain/linkdefault.png
+
media/userprofilepics/*
!media/userprofilepics/default.jpg
media/uploadsCK/*
diff --git a/media/agencymain/linkdefault.jpg b/media/agencymain/linkdefault.jpg
deleted file mode 100644
index 1b0b9d474da9ae5c82140ae8d8bd407920abbc51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2884
zcmbtVcUV)&7N0Z%giZojgG-C3i-Ht&L$J_9mM*O5A|OWK0~SzFL?TTjpg<6C6$u7b
zn$(D_h=yiCWPz2gNQr_dXefq2%6*shef!?}&)fIj+&TB&`DV_{?|0@DXaE`oO8c#B
ztpEan07u~mKrg{wfI=cyI^583$4Fx^Xf#F^iMPG3MxwS3d#yNoRXT7
zvMQcHAjm1IYpCHhRPY4+$|eXDtb@kLU@$Uxd7M1{zivJ7K*;RlhNemB#PMxLMsKqh;jGBlv`M
z%c^N_AJds#q4o!}zege0eBkKmp>tEczyAB%PH1_hl2;K|o5H
zvE|YRC7sRnUU5H?zy0Jff9tw?cCX%CpJBdLoJCvaeLeltD14*vTe`>%0!bGoU9<&9
z%3Mkj1m?&@-YjuQQ9{Q`oK8YOV$Ev4Cv>xnag($|faj=~lBX#c9HS`;IG#zZ_2073
ztV^hBD|+eKV70gQnAL^tJJ6TcXr_t-KRd@J;+<@e)zN-jdEyuZ5Yd%f1>pnjo0xTK?vdSqCV31$~M#jJfbbyUlyJA7h)lx;>BRqk@
zav^6ajJBvl{I~yTE(8=lit{1xjtQR;2y4BeQ@+Mw61^|aV5B?Z!=u0t;9Wkwt%~;jZ0rP;JP$%&$PTSgK^PSiBg
z=v@1n2=683^f3A88$x+W<4{`jxftSlktN-%!7jkVzkZ*QcG(FVeZP#ZENYV`MjM1P
zqWofpN9q`YQ^tx(6#36!sCrncyu#B|?ZGu^4_f>8&s#n&teupmPL4c++0%F>673JK
zRVDp3{Z=_)T{t0jc7y_B8f*=TZe{c}5t`&BB#X+EEQj|+=2@xtD
zqP^>_d`&-ag2bX{Bu0nBR&s_Fs5KC%zR(YWeVtyu?oTK@H-jaUvj#$qAlkx#g(l{8
z&euDL)WtcJH(c{Iw1KD>5U?tbS#a^$ZHaeHC9ybU2!s${K0RSq9BnEHDyF*Z%I`D&
zK!reBa0gnBlEyX@KEQS`ZewF!6YJ8u)Exz(yb(wF(sf+{%QNiRpuzmaq**?d7@0q*
zLo@n0W!rIWMwo5kW)H^qw(kQ!5C^XF^*G{u;}Z=I<0o!a320P<=dTK{WtL2kI*(y5
zgf6UobHN4z1DSl?hXQfwqwzGnrE%K%&2J}5ZAP?B4y}bx<2lp9(aIE}
z9AymMd-7t?f`^ZcH{YgreN)y?X^O;+>u*Ru-63_qL*259H<3yGWh&yQ0sp?x%_jW2
z?^Mh(tdPa)03jm7dg4EU`&RCmMf^1%9ic^X}nef(83M~22f`5rf(dv-n{
z-PG^$uHX+|g|1E(n3V{BxB~)lCA2p7AZ?%}5RMIMWpx>sDbUXmT_@*=Q%yL_x=}|v
zJ4Ob>CEpv3)rphJDGLGppDbf=l6K}?C{vy@O@_m-;2Q)YHjZ1S5<-0Qw!q_qmE(G8W438@K8HjCyoDkppCN7)kRJl2pRO^
z$EENy1uh}u)wgKAuXS3pBO?MgWT?3UMykcL^k-+La>G;mtK1*cc>61tOv!eVmVV;0
zzP`{fy_rrbL|Eb-5ngK{(B#T_GdRte_O69Mw^9E`)@tU?;K9YnMD;<0V!lZ>3Ir
zn!X1Cy;Z!Il9oQ^vT@)di-UoHU+0op=YQvbrw+O0?u@xkRcQ(d435=G#vj#>?Q(m+
z@x1#eXU2L3;jA9alD2GI_61=81xA=m;jh0BBP`#eO0lMlW_is8N9BlZW;Tl-n%?0
zlppTMJ+^3m*pP)1evY**$?f23(f{J>K9{&x;NPCr#Yfv?FV8e1yR;``TR
z9;`cSYn(DwOWKg`ov@kUbaCca-LYxQb1wF79zFW!OA8PdjmR4|-j;Z0z@n4>lc1o%
Fe*i{vaXzF#2MmFvd|
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
Quicklink aktualisieren
-
{% endif %}
+
+
+ Quicklinks
+ {% if links|length > 0 %}
+ {% for s in links %}
+ {{s.name}}
+ {% endfor %}
+ {% else %}
+ Keine Ergebnisse in Quicklinks
+ {% endif %}
\ No newline at end of file
diff --git a/users/views.py b/users/views.py
index 180aa92..6a6aa43 100644
--- a/users/views.py
+++ b/users/views.py
@@ -12,6 +12,7 @@ from django.core.mail import send_mail
from django.http import HttpResponseRedirect,HttpResponse, JsonResponse
from areas.models import Areas
from tasks.models import Tasks
+from quicklinks.models import QuickLinks
from .priomodel import Prio
from standards.models import Standards
from datetime import datetime
@@ -404,7 +405,8 @@ def GlobalSearch(request):
res_areas = Areas.objects.filter(agency__pk=ag).filter(name__icontains=searchfor)
res_tasks = Tasks.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) |Tasks.objects.filter(agency__pk=ag).filter(area__name__icontains=searchfor)
res_pers = User.objects.filter(profile__agency__pk=ag).filter(first_name__icontains=searchfor) | User.objects.filter(profile__agency__pk=ag).filter(last_name__icontains=searchfor)
- html = render_to_string('users/searchres.html', {'res_standard': res_standard, 'res_areas': res_areas, 'res_tasks': res_tasks, 'res_pers': res_pers})
+ links = QuickLinks.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) | QuickLinks.objects.filter(agency__pk=ag).filter(link__icontains=searchfor)
+ html = render_to_string('users/searchres.html', {'links': links, 'res_standard': res_standard, 'res_areas': res_areas, 'res_tasks': res_tasks, 'res_pers': res_pers})
return HttpResponse(html)
else:
return HttpResponse("Request method is not a GET")