Merge branch 'main' into time_spent

This commit is contained in:
Christopher Broderick 2024-07-22 11:01:52 +01:00 committed by GitHub
commit 0a2ceca8dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@ jobs:
- name: Lint with ruff - name: Lint with ruff
run: | run: |
pip install ruff pip install ruff
ruff helpdesk ruff check helpdesk
- name: Test with pytest - name: Test with pytest
run: | run: |

View File

@ -119,7 +119,7 @@ urlpatterns = [
re_path(r"^reports/(?P<report>\w+)/$", re_path(r"^reports/(?P<report>\w+)/$",
staff.run_report, name="run_report"), staff.run_report, name="run_report"),
path("save_query/", staff.save_query, name="savequery"), path("save_query/", staff.save_query, name="savequery"),
path("delete_query/<int:id>/", staff.delete_saved_query, name="delete_query"), path("delete_query/<int:pk>/", staff.delete_saved_query, name="delete_query"),
path("settings/", staff.EditUserSettingsView.as_view(), name="user_settings"), path("settings/", staff.EditUserSettingsView.as_view(), name="user_settings"),
path("ignore/", staff.email_ignore, name="email_ignore"), path("ignore/", staff.email_ignore, name="email_ignore"),
path("ignore/add/", staff.email_ignore_add, name="email_ignore_add"), path("ignore/add/", staff.email_ignore_add, name="email_ignore_add"),