diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index d447392..7bd6468 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index b795e99..a8d1148 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -15,9 +15,11 @@ import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + ############################################## DEV ##################################### BASE_URL = "https://dev01.digitale-agentur.com/" - +CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True diff --git a/standards/templates/standards/standard_area.html b/standards/templates/standards/standard_area.html index 5f6d58e..3b13821 100644 --- a/standards/templates/standards/standard_area.html +++ b/standards/templates/standards/standard_area.html @@ -9,7 +9,7 @@

Standards aus dem Bereich {{areaname}}


-
+
diff --git a/users/templates/users/searchres.html b/users/templates/users/searchres.html index 24a0f19..f891554 100644 --- a/users/templates/users/searchres.html +++ b/users/templates/users/searchres.html @@ -49,6 +49,16 @@

Keine Ergebnisse bei Mitarbeitern

{% endif %} +
+

Dateien

+ {% if res_files|length > 0 %} + {% for s in res_files %} +   {{s.name}}

+ {% endfor %} + {% else %} +

Keine Ergebnisse bei Mitarbeitern

+ {% endif %} +

Quicklinks

{% if links|length > 0 %} diff --git a/users/views.py b/users/views.py index 61d14df..b7c220f 100644 --- a/users/views.py +++ b/users/views.py @@ -19,6 +19,7 @@ from datetime import datetime from django.utils import timezone from django.utils import formats from news.models import News +from cloud.models import DataFile import requests import json import random @@ -519,7 +520,11 @@ def GlobalSearch(request): 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) 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, 'res_news' : res_news, 'res_pass' : res_pass, 'res_contacts' : res_contacts}) + res_files = DataFile.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) + + print(res_files) + + 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, 'res_news' : res_news, 'res_pass' : res_pass, 'res_contacts' : res_contacts, 'res_files' : res_files}) return HttpResponse(html) else: return HttpResponse("Request method is not a GET")