From c8f8e81ddd7b608fee1ee25ddcc7a430882cad95 Mon Sep 17 00:00:00 2001 From: Mike Allaway Date: Wed, 29 Jan 2025 12:40:47 +0000 Subject: [PATCH 1/2] minor fix --- .gitignore | 1 + web_extension_chrome/manifest.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 108eaed..dda295a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ django/static/ django/general/migrations/ node_modules/ local_settings.js +web_extension_chrome.zip ###################### Django Templated gitignore paths ###################### diff --git a/web_extension_chrome/manifest.json b/web_extension_chrome/manifest.json index 2f81458..0938939 100644 --- a/web_extension_chrome/manifest.json +++ b/web_extension_chrome/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Ethical Interface", - "version": "1.1.0", + "version": "1.1.1", "description": "Engage with the Ethical Interface research project run by Rosie Graham at the University of Birmingham", "permissions": ["tabs"], "host_permissions": [""], From ab26da98f557cebd06a9bd9397a1da914656efff Mon Sep 17 00:00:00 2001 From: Mike Allaway Date: Mon, 7 Apr 2025 08:31:03 +0100 Subject: [PATCH 2/2] order triggers by newest first and allow to bulk delete via admin dashboard --- django/researchdata/admin.py | 6 ------ django/researchdata/models.py | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/django/researchdata/admin.py b/django/researchdata/admin.py index 6fbbed3..7263795 100644 --- a/django/researchdata/admin.py +++ b/django/researchdata/admin.py @@ -58,12 +58,6 @@ class [ModelName]AdminView(GenericAdminView): 'meta_lastupdated_datetime' ) - def get_actions(self, request): - actions = super().get_actions(request) - if 'delete_selected' in actions: - del actions['delete_selected'] - return actions - def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) # Set all many to many fields to display the filter_horizontal widget diff --git a/django/researchdata/models.py b/django/researchdata/models.py index 6a5373b..ce41043 100644 --- a/django/researchdata/models.py +++ b/django/researchdata/models.py @@ -72,7 +72,7 @@ def __str__(self): return self.trigger_text class Meta: - ordering = (Upper('trigger_text'), 'id') + ordering = ('-meta_lastupdated_datetime', Upper('trigger_text'), 'id') class Prompt(models.Model):