From 88d017e6d9f5984467fea7863cae7e9256427812 Mon Sep 17 00:00:00 2001 From: Jeffrey Kirchner Date: Tue, 21 Nov 2023 09:45:55 -0800 Subject: [PATCH 1/2] update help doc subject naming --- main/consumers/subject/subject_home_consumer.py | 2 +- main/consumers/subject/subject_home_consumer_mixins/__init__.py | 2 +- .../subject/subject_home_consumer_mixins/help_doc_subject.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/consumers/subject/subject_home_consumer.py b/main/consumers/subject/subject_home_consumer.py index eda34c42..0f319d19 100644 --- a/main/consumers/subject/subject_home_consumer.py +++ b/main/consumers/subject/subject_home_consumer.py @@ -19,7 +19,7 @@ class SubjectHomeConsumer(SocketConsumerMixin, InstructionsMixin, PhaseMixin, TimeMixin, - GetHelpDocSubject, + GetHelpDocSubjectMixin, InterfaceMixin): ''' websocket methods for subject home diff --git a/main/consumers/subject/subject_home_consumer_mixins/__init__.py b/main/consumers/subject/subject_home_consumer_mixins/__init__.py index acaefe60..6ac8e5d0 100644 --- a/main/consumers/subject/subject_home_consumer_mixins/__init__.py +++ b/main/consumers/subject/subject_home_consumer_mixins/__init__.py @@ -9,4 +9,4 @@ from .phase import PhaseMixin from .time import TimeMixin from .interface import InterfaceMixin -from .help_doc_subject import GetHelpDocSubject \ No newline at end of file +from .help_doc_subject import GetHelpDocSubjectMixin \ No newline at end of file diff --git a/main/consumers/subject/subject_home_consumer_mixins/help_doc_subject.py b/main/consumers/subject/subject_home_consumer_mixins/help_doc_subject.py index d11b1d00..18e24f73 100644 --- a/main/consumers/subject/subject_home_consumer_mixins/help_doc_subject.py +++ b/main/consumers/subject/subject_home_consumer_mixins/help_doc_subject.py @@ -11,7 +11,7 @@ import main -class GetHelpDocSubject(): +class GetHelpDocSubjectMixin(): ''' Get help doc subject mixin for subject home consumer ''' From 9e44375411c6f79c04db326fd0188575f9b34591 Mon Sep 17 00:00:00 2001 From: Jeffrey Kirchner Date: Tue, 21 Nov 2023 09:50:36 -0800 Subject: [PATCH 2/2] update parameter set import. --- main/models/parameter_set.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main/models/parameter_set.py b/main/models/parameter_set.py index d2887435..85b87bf6 100644 --- a/main/models/parameter_set.py +++ b/main/models/parameter_set.py @@ -217,6 +217,8 @@ def from_dict(self, new_ps): if v.get("parameter_set_hat", None) != None: p.parameter_set_hat_id=new_parameter_set_hats_map[str(v["parameter_set_hat"])] + p.save() + #parameter set players self.parameter_set_players.all().delete()