This commit is contained in:
Ross
2021-03-19 11:42:15 +00:00
parent ba8af9ad1e
commit fbd857431e
2 changed files with 17 additions and 8 deletions
+1
View File
@@ -36,6 +36,7 @@ urlpatterns = [
path("exam/json/<int:pk>", views.RapidExamViews.exam_json, name="exam_json"), path("exam/json/<int:pk>", views.RapidExamViews.exam_json, name="exam_json"),
path("exam/json/<int:pk>/recreate", views.RapidExamViews.exam_json_recreate, name="exam_json_recreate"), path("exam/json/<int:pk>/recreate", views.RapidExamViews.exam_json_recreate, name="exam_json_recreate"),
path("create/", views.RapidCreate.as_view(), name="rapid_create"), path("create/", views.RapidCreate.as_view(), name="rapid_create"),
path("create/exam/<int:pk>", views.RapidCreate.as_view(), name="rapid_create"),
path("create/defaults", path("create/defaults",
views.RapidCreationDefaultView.as_view(), views.RapidCreationDefaultView.as_view(),
name="rapid_create_defaults"), name="rapid_create_defaults"),
+16 -8
View File
@@ -307,16 +307,24 @@ class RapidCreateBase(LoginRequiredMixin, CreateView):
# @login_required # @login_required
class RapidCreate(RapidCreateBase): class RapidCreate(RapidCreateBase):
initial = {"laterality": Rapid.NONE} #initial = {"laterality": Rapid.NONE}
def get_initial(self): def get_initial(self):
# There has to be a better way... if "pk" in self.kwargs:
try: initial = super().get_initial()
s = (i.pk for i in self.request.user.rapid_default.site.all()) exam = get_object_or_404(Exam, pk=self.kwargs["pk"])
self.initial.update({"site": s})
except AttributeError: initial['exam'] = exam.id
pass
return self.initial return initial
## There has to be a better way...
#try:
# s = (i.pk for i in self.request.user.rapid_default.site.all())
# self.initial.update({"site": s})
#except AttributeError:
# pass
#return self.initial
# fields = '__all__' # fields = '__all__'
# #fields = [ 'condition' ] # #fields = [ 'condition' ]