Skip to content

Commit

Permalink
Merge pull request #254 from jeffreykirchner/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
jeffreykirchner authored Nov 21, 2023
2 parents 300faa5 + 9e44375 commit 57791ec
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion main/consumers/subject/subject_home_consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class SubjectHomeConsumer(SocketConsumerMixin,
InstructionsMixin,
PhaseMixin,
TimeMixin,
GetHelpDocSubject,
GetHelpDocSubjectMixin,
InterfaceMixin):
'''
websocket methods for subject home
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
from .phase import PhaseMixin
from .time import TimeMixin
from .interface import InterfaceMixin
from .help_doc_subject import GetHelpDocSubject
from .help_doc_subject import GetHelpDocSubjectMixin
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import main

class GetHelpDocSubject():
class GetHelpDocSubjectMixin():
'''
Get help doc subject mixin for subject home consumer
'''
Expand Down
2 changes: 2 additions & 0 deletions main/models/parameter_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit 57791ec

Please sign in to comment.