Merge pull request #640 from nearbeach/develop

Develop
nearbeach · Jul 5, 2024 · 7d8b35b · 7d8b35b
2 parents c91d5e1 + b514960
commit 7d8b35b
Show file tree

Hide file tree

Showing 25 changed files with 55 additions and 91 deletions.
diff --git 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/static/NearBeach/6521.min.js b/NearBeach/static/NearBeach/6521.min.js
diff --git a/NearBeach/static/NearBeach/6521.min.js.gz b/NearBeach/static/NearBeach/6521.min.js.gz
diff --git a/NearBeach/static/NearBeach/8722.min.js b/NearBeach/static/NearBeach/8722.min.js
diff --git a/NearBeach/static/NearBeach/8722.min.js.gz b/NearBeach/static/NearBeach/8722.min.js.gz
diff --git a/NearBeach/static/NearBeach/NearBeach.min.js b/NearBeach/static/NearBeach/NearBeach.min.js
diff --git a/NearBeach/static/NearBeach/NearBeach.min.js.gz b/NearBeach/static/NearBeach/NearBeach.min.js.gz
diff --git a/NearBeach/static/NearBeach/kanban-information.min.js b/NearBeach/static/NearBeach/kanban-information.min.js
diff --git a/NearBeach/static/NearBeach/kanban-information.min.js.gz b/NearBeach/static/NearBeach/kanban-information.min.js.gz
diff --git a/NearBeach/static/NearBeach/organisation-modules.min.js b/NearBeach/static/NearBeach/organisation-modules.min.js
diff --git a/NearBeach/static/NearBeach/organisation-modules.min.js.gz b/NearBeach/static/NearBeach/organisation-modules.min.js.gz
diff --git a/NearBeach/static/NearBeach/parent-modules.min.js b/NearBeach/static/NearBeach/parent-modules.min.js
diff --git a/NearBeach/static/NearBeach/parent-modules.min.js.gz b/NearBeach/static/NearBeach/parent-modules.min.js.gz
diff --git a/.../NearBeach/src_js_components_dates_BetweenDates_vue-src_js_mixins_getThemeMixin_js.min.js b/.../NearBeach/src_js_components_dates_BetweenDates_vue-src_js_mixins_getThemeMixin_js.min.js
diff --git a/...arBeach/src_js_components_dates_BetweenDates_vue-src_js_mixins_getThemeMixin_js.min.js.gz b/...arBeach/src_js_components_dates_BetweenDates_vue-src_js_mixins_getThemeMixin_js.min.js.gz
diff --git a/...modules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-0a033e.min.js b/...modules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-0a033e.min.js
diff --git a/...ules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-0a033e.min.js.gz b/...ules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-0a033e.min.js.gz
diff --git a/...modules_sub_modules_DocumentsModule_vue-src_js_components_modules_sub_modul-f023aa.min.js b/...modules_sub_modules_DocumentsModule_vue-src_js_components_modules_sub_modul-f023aa.min.js
diff --git a/...ules_sub_modules_DocumentsModule_vue-src_js_components_modules_sub_modul-f023aa.min.js.gz b/...ules_sub_modules_DocumentsModule_vue-src_js_components_modules_sub_modul-f023aa.min.js.gz
diff --git 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="")

diff --git a/src/js/components/modules/sub_modules/BugsModule.vue b/src/js/components/modules/sub_modules/BugsModule.vue
@@ -66,7 +66,7 @@
 
 		<!-- Add Bug Button -->
 		<!-- TO DO - limit it to certain users -->
-		<hr/>
+		<hr v-if="userLevel > 1"/>
 		<div class="row submit-row">
 			<div class="col-md-12">
 				<button

diff --git a/src/js/components/modules/sub_modules/ChildSprints.vue b/src/js/components/modules/sub_modules/ChildSprints.vue
@@ -29,7 +29,7 @@
 				</button>
 			</div>
 		</div>
-		<hr>
+		<hr v-if="destination === 'project'" class="mt-4">
 	</div>
 
 	<new-sprint-wizard

diff --git a/src/js/components/modules/sub_modules/DocumentsModule.vue b/src/js/components/modules/sub_modules/DocumentsModule.vue
@@ -103,7 +103,7 @@
 		</div>
 
 		<!-- ADD DOCUMENTS AND FOLDER BUTTON -->
-		<hr/>
+		<hr v-if="userLevel > 1" />
 		<div class="btn-group save-changes"
 			 v-if="readOnly === false"
 		>

diff --git a/src/js/components/modules/sub_modules/NotesModule.vue b/src/js/components/modules/sub_modules/NotesModule.vue
@@ -14,8 +14,7 @@
 		></list-notes>
 
 		<!-- ADD NOTE HISTORY -->
-		<!-- TO DO - limit it to certain users -->
-		<hr/>
+		<hr v-if="userLevel > 1" />
 		<div class="row submit-row">
 			<div class="col-md-12">
 				<button

diff --git a/src/js/components/modules/sub_modules/ObjectLinks.vue b/src/js/components/modules/sub_modules/ObjectLinks.vue
@@ -70,6 +70,7 @@
 		</div>
 
 		<!-- Submit Button -->
+		<hr v-if="userLevel > 1" />
 		<div class="row submit-row">
 			<div class="col-md-12">
 				<a
@@ -81,7 +82,6 @@
 				>
 			</div>
 		</div>
-		<hr/>
 
 		<!-- MODAL FOR NEW OBJECT LINKS -->
 		<new-link-wizard