From c430a0132c9a4f3f2eb8848ab74c41d167894023 Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Sun, 23 Jun 2024 14:20:52 +0300 Subject: [PATCH] Small fixes --- .vscode/settings.json | 4 ++++ rsconcept/backend/apps/rsform/graph.py | 2 +- rsconcept/backend/apps/rsform/models/Editor.py | 4 ++-- .../frontend/src/app/Navigation/Navigation.tsx | 16 +++------------- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index b666ff7a..eeb1c625 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -38,6 +38,10 @@ { "name": "django", "depth": 5 + }, + { + "name": "djangorestframework", + "depth": 2 } ], "colorize.include": [".tsx", ".jsx", ".ts", ".js"], diff --git a/rsconcept/backend/apps/rsform/graph.py b/rsconcept/backend/apps/rsform/graph.py index 4177840d..b6a749ad 100644 --- a/rsconcept/backend/apps/rsform/graph.py +++ b/rsconcept/backend/apps/rsform/graph.py @@ -91,7 +91,7 @@ class Graph(Generic[ItemType]): if len(self.inputs[node_id]) == 0: continue for parent in self.inputs[node_id]: - result[parent] = result[parent] + [id for id in result[node_id] if not id in result[parent]] + result[parent] = result[parent] + [id for id in result[node_id] if id not in result[parent]] return result def topological_order(self) -> list[ItemType]: diff --git a/rsconcept/backend/apps/rsform/models/Editor.py b/rsconcept/backend/apps/rsform/models/Editor.py index 2f9ce6a0..d43ae17c 100644 --- a/rsconcept/backend/apps/rsform/models/Editor.py +++ b/rsconcept/backend/apps/rsform/models/Editor.py @@ -60,12 +60,12 @@ class Editor(Model): ''' Set editors for item. ''' processed: list[User] = [] for editor_item in Editor.objects.filter(item=item): - if not editor_item.editor in users: + if editor_item.editor not in users: editor_item.delete() else: processed.append(editor_item.editor) for user in users: - if not user in processed: + if user not in processed: processed.append(user) Editor.objects.create(item=item, editor=user) diff --git a/rsconcept/frontend/src/app/Navigation/Navigation.tsx b/rsconcept/frontend/src/app/Navigation/Navigation.tsx index 207dccae..447efeb2 100644 --- a/rsconcept/frontend/src/app/Navigation/Navigation.tsx +++ b/rsconcept/frontend/src/app/Navigation/Navigation.tsx @@ -48,19 +48,9 @@ function Navigation() {
- } - onClick={navigateCreateNew} - /> - } - onClick={navigateLibrary} - /> - } onClick={navigateHelp} /> + } onClick={navigateCreateNew} /> + } onClick={navigateLibrary} /> + } onClick={navigateHelp} />