diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 37864ef3..87a116e7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: rev: v0.9.2 hooks: - id: ruff - args: [ --fix ] + args: [ "--fix" ] - id: ruff-format # - repo: https://github.com/pycqa/isort diff --git a/journal/apis/note.py b/journal/apis/note.py index 7efa1b84..b5c92f32 100644 --- a/journal/apis/note.py +++ b/journal/apis/note.py @@ -78,11 +78,11 @@ def add_note_for_item(request, item_uuid: str, n_in: NoteInSchema): response={200: NoteSchema, 401: Result, 403: Result, 404: Result}, tags=["note"], ) -def update_note(request, tag_uuid: str, n_in: NoteInSchema): +def update_note(request, note_uuid: str, n_in: NoteInSchema): """ Update a note. """ - note = Note.get_by_url_and_owner(tag_uuid, request.user.identity.pk) + note = Note.get_by_url_and_owner(note_uuid, request.user.identity.pk) if not note: return NOT_FOUND note.title = n_in.title @@ -101,11 +101,11 @@ def update_note(request, tag_uuid: str, n_in: NoteInSchema): response={200: Result, 401: Result, 403: Result, 404: Result}, tags=["note"], ) -def delete_note(request, tag_uuid: str): +def delete_note(request, note_uuid: str): """ Delete a note. """ - note = Note.get_by_url_and_owner(tag_uuid, request.user.identity.pk) + note = Note.get_by_url_and_owner(note_uuid, request.user.identity.pk) if not note: return NOT_FOUND note.delete() diff --git a/journal/models/itemlist.py b/journal/models/itemlist.py index 1f2654dc..9d697ae4 100644 --- a/journal/models/itemlist.py +++ b/journal/models/itemlist.py @@ -40,7 +40,7 @@ class List(Piece): @property def ordered_members(self): - return self.members.all().order_by("position") + return self.members.all().order_by("position", "item_id") @property def ordered_items(self): @@ -104,7 +104,7 @@ class List(Piece): i = ordered_member_ids.index(m.pk) if m.position != i + 1: m.position = i + 1 - m.save() + m.save(update_fields=["position"]) except ValueError: pass diff --git a/journal/templates/_list_item.html b/journal/templates/_list_item.html index 6bf8b373..27a2acf3 100644 --- a/journal/templates/_list_item.html +++ b/journal/templates/_list_item.html @@ -86,7 +86,7 @@ {% endif %} {% endif %} {% if collection_member %} -
+