Skip to content

minor changes to triggers #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mike-allaway merged 2 commits into from
Apr 7, 2025
Merged

minor changes to triggers #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f8e81
minor fix
mike-allaway Jan 29, 2025
ab26da9
order triggers by newest first and allow to bulk delete via admin das…
mike-allaway Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ django/static/
django/general/migrations/
node_modules/
local_settings.js
web_extension_chrome.zip


###################### Django Templated gitignore paths ######################
Expand Down
6 changes: 0 additions & 6 deletions django/researchdata/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion django/researchdata/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion web_extension_chrome/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": ["<all_urls>"],
Expand Down