From fbd857431e8101ac21300b4593bed96565a5bb1b Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Fri, 19 Mar 2021 11:42:15 +0000
Subject: [PATCH] .

---
 rapids/urls.py  |  1 +
 rapids/views.py | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/rapids/urls.py b/rapids/urls.py
index 28b54c4a..4d86dcc8 100755
--- a/rapids/urls.py
+++ b/rapids/urls.py
@@ -36,6 +36,7 @@ urlpatterns = [
     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("create/", views.RapidCreate.as_view(), name="rapid_create"),
+    path("create/exam/<int:pk>", views.RapidCreate.as_view(), name="rapid_create"),
     path("create/defaults",
          views.RapidCreationDefaultView.as_view(),
          name="rapid_create_defaults"),
diff --git a/rapids/views.py b/rapids/views.py
index 4f52758e..d7cc0886 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -307,16 +307,24 @@ class RapidCreateBase(LoginRequiredMixin, CreateView):
 # @login_required
 class RapidCreate(RapidCreateBase):
 
-    initial = {"laterality": Rapid.NONE}
+    #initial = {"laterality": Rapid.NONE}
 
     def get_initial(self):
-        # 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
+        if "pk" in self.kwargs:
+            initial = super().get_initial()
+            exam = get_object_or_404(Exam, pk=self.kwargs["pk"])
+
+            initial['exam'] = exam.id
+
+            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 = [ 'condition' ]