From fa934a0ae45b86f2f1967d0890360be37511f8b1 Mon Sep 17 00:00:00 2001 From: nearbeach Date: Fri, 5 Jul 2024 21:57:39 +1000 Subject: [PATCH 1/3] Bugfix - nearbeach-1406 Read only user can't update their planner --- NearBeach/middleware/HandleErrorPages.py | 39 +++++++++++++----------- NearBeach/views/user_job_views.py | 18 ++--------- 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/NearBeach/middleware/HandleErrorPages.py b/NearBeach/middleware/HandleErrorPages.py index 98dc4f5d7..45603c2f2 100644 --- a/NearBeach/middleware/HandleErrorPages.py +++ b/NearBeach/middleware/HandleErrorPages.py @@ -1,8 +1,10 @@ -from django.http import HttpResponseNotFound, HttpResponseBadRequest -from django.template.loader import get_template +from django.http import HttpResponse +from django.template.loader import get_template, TemplateDoesNotExist +from django.conf import settings from NearBeach.views.theme_views import get_theme + class TemplateErrorMiddleware: def __init__(self, get_response): self.get_response = get_response @@ -11,26 +13,27 @@ def __call__(self, request): # Response response = self.get_response(request) - if response.status_code == 404: - # Get template - template = get_template('404.html') - - # Context - c = { - "theme": get_theme(request), - } - - response = HttpResponseNotFound(template.render(c)) + # On debug send back response + if settings.DEBUG: + return response - if response.status_code == 500: - # Get template - template = get_template('500.html') + try: + # Error Template + t = get_template(f"{response.status_code}.html") - # Content + # Context c = { + "nearbeach_title": "error", + "need_tinymce": False, "theme": get_theme(request), } - response = HttpResponseBadRequest(template.render(c)) - + # Return + response = HttpResponse( + t.render(c, request), + status=response.status_code, + ) + except TemplateDoesNotExist: + pass return response + diff --git a/NearBeach/views/user_job_views.py b/NearBeach/views/user_job_views.py index ea1a58d48..9e3a441a7 100644 --- a/NearBeach/views/user_job_views.py +++ b/NearBeach/views/user_job_views.py @@ -128,23 +128,9 @@ def get_my_planning_objects(request, delta=7): "job_sort_number", ) - results = project_results.union( - task_results - ).union( - card_results - ).values( - "user_job_id", - "object_type", - "location_id", - "title", - "end_date", - "status", - "higher_order_status", - "job_date", - "job_sort_number", - ).order_by("job_sort_number") + results = list(project_results) + list(task_results) + list(card_results) - return json.dumps(list(results), cls=DjangoJSONEncoder) + return json.dumps(results, cls=DjangoJSONEncoder) @login_required(login_url="login", redirect_field_name="") From 7309c9e0ad66053d4755640c4bd57cb24cc95794 Mon Sep 17 00:00:00 2001 From: nearbeach Date: Fri, 5 Jul 2024 22:24:29 +1000 Subject: [PATCH 2/3] Bugfixes - nearbeach-1401 || nearbeach-1402 || nearbeach-1403 || nearbeach-1404 || nearbeach-1405 || nearbeach-1407 || nearbeach-1408 -> essnetially removing the extra
when user is read only --- src/js/components/modules/sub_modules/BugsModule.vue | 2 +- src/js/components/modules/sub_modules/ChildSprints.vue | 2 +- src/js/components/modules/sub_modules/DocumentsModule.vue | 2 +- src/js/components/modules/sub_modules/NotesModule.vue | 3 +-- src/js/components/modules/sub_modules/ObjectLinks.vue | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/js/components/modules/sub_modules/BugsModule.vue b/src/js/components/modules/sub_modules/BugsModule.vue index 410e5b0bf..d05f832c1 100644 --- a/src/js/components/modules/sub_modules/BugsModule.vue +++ b/src/js/components/modules/sub_modules/BugsModule.vue @@ -66,7 +66,7 @@ -
+
-
+
-
+
diff --git a/src/js/components/modules/sub_modules/NotesModule.vue b/src/js/components/modules/sub_modules/NotesModule.vue index d88a5a58f..de0ecf055 100644 --- a/src/js/components/modules/sub_modules/NotesModule.vue +++ b/src/js/components/modules/sub_modules/NotesModule.vue @@ -14,8 +14,7 @@ > - -
+