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 1b0b9d4..0000000 Binary files a/media/agencymain/linkdefault.jpg and /dev/null differ diff --git a/media/agencymain/linkdefault.png b/media/agencymain/linkdefault.png new file mode 100644 index 0000000..d742a6b Binary files /dev/null and b/media/agencymain/linkdefault.png differ diff --git a/quicklinks/__pycache__/models.cpython-38.pyc b/quicklinks/__pycache__/models.cpython-38.pyc index 66707db..a9748ae 100644 Binary files a/quicklinks/__pycache__/models.cpython-38.pyc and b/quicklinks/__pycache__/models.cpython-38.pyc differ diff --git a/quicklinks/models.py b/quicklinks/models.py index aae9c14..7fc95bf 100644 --- a/quicklinks/models.py +++ b/quicklinks/models.py @@ -22,7 +22,7 @@ class QuickLinks(models.Model): agency = models.ForeignKey(Agency, on_delete=models.PROTECT) name = models.CharField(max_length=200, blank=False) link = models.CharField(max_length=200, blank=False) - logo = models.ImageField(default='agencymain/default.jpg', upload_to='agencymain', blank=True) + logo = models.ImageField(default='agencymain/linkdefault.png', upload_to='agencymain', blank=True) def __str__(self): return f'{self.name}' @@ -35,5 +35,5 @@ class QuickLinks(models.Model): if self.logo and hasattr(self.logo, 'url'): return self.logo.url else: - return "/media/agencymain/linkdefault.jpg" + return "/media/agencymain/linkdefault.png" diff --git a/quicklinks/templates/quicklinks/ql_update.html b/quicklinks/templates/quicklinks/ql_update.html index 1011024..5608ca4 100644 --- a/quicklinks/templates/quicklinks/ql_update.html +++ b/quicklinks/templates/quicklinks/ql_update.html @@ -4,7 +4,7 @@

Quicklink aktualisieren


-
+ {% csrf_token %} {{ form|crispy }}
diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index e49cd86..2f55caa 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ diff --git a/users/templates/users/searchres.html b/users/templates/users/searchres.html index 80ce3e4..5b4479f 100644 --- a/users/templates/users/searchres.html +++ b/users/templates/users/searchres.html @@ -38,4 +38,14 @@ {% else %}

Keine Ergebnisse in Personen

{% 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")