From d77cc9d7255b20dc70e7523aa227c513634231cc Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Fri, 18 Mar 2022 22:56:08 +0300 Subject: [PATCH] move --- Main/views/SetSettingsView.py | 18 +++++++++--------- Main/views/SolutionsTableView.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Main/views/SetSettingsView.py b/Main/views/SetSettingsView.py index 0e2c8ec..ffa9f85 100644 --- a/Main/views/SetSettingsView.py +++ b/Main/views/SetSettingsView.py @@ -101,23 +101,23 @@ class SetSettingsView(BaseView): return "/admin/set?set_id=" + str(self.set.id) def post_languages_edit(self): - current_languages = self.entities.set.languages - self.entities.set.auto_add_new_languages = 'auto_add' in self.request.POST + current_languages = self.set.languages + self.set.auto_add_new_languages = 'auto_add' in self.request.POST for key, value in self.request.POST.items(): if key.startswith("language_"): i = int(key.split("_")[1]) if i not in current_languages: - self.entities.set.languages.append(i) + self.set.languages.append(i) to_delete = [i for i in current_languages if "language_" + str(i) not in self.request.POST] for t in to_delete: - self.entities.set.languages.remove(t) - self.entities.set.save() - return "/admin/set?set_id=" + str(self.entities.set.id) + self.set.languages.remove(t) + self.set.save() + return "/admin/set?set_id=" + str(self.set.id) def post_new_checker(self): - Checker.objects.create(name=self.request.POST['name'], set=self.entities.set, last_request=timezone.now() - datetime.timedelta(days=1)) - return '/admin/set?set_id=' + str(self.entities.set.id) + Checker.objects.create(name=self.request.POST['name'], set=self.set, last_request=timezone.now() - datetime.timedelta(days=1)) + return '/admin/set?set_id=' + str(self.set.id) def post_delete_checker(self): Checker.objects.get(id=self.request.POST['checker_id']).delete() - return '/admin/set?set_id=' + str(self.entities.set.id) + return '/admin/set?set_id=' + str(self.set.id) diff --git a/Main/views/SolutionsTableView.py b/Main/views/SolutionsTableView.py index 75c75a7..924d3f4 100644 --- a/Main/views/SolutionsTableView.py +++ b/Main/views/SolutionsTableView.py @@ -31,7 +31,7 @@ class SolutionsTableView(BaseView): else: raise AccessError() else: - if hasattr(self.entities, 'setTask'): + if self.set: queryset = queryset.filter(user=self.request.user, task=self.setTask.task, set=self.setTask.set) else: queryset = queryset.filter(user=self.request.user, task=self.task, set=None)