inline company creation as well

digitalfox · Oct 20, 2024 · 477ddf9 · 477ddf9
1 parent e845da3
commit 477ddf9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/crm/forms.py b/crm/forms.py
@@ -249,17 +249,16 @@ def __init__(self, *args, **kwargs):
         super(MissionContactForm, self).__init__(*args, **kwargs)
         if mission_id:
             self.inline_helper.form_action = reverse("crm:linked_mission_contact_create", args=[mission_id])
-        self.inline_helper.layout = Layout(Div(Column(FieldWithButtons("contact",
-                                        HTML(
-                                            """<a role='button' class='btn btn-primary' href='#' onclick='$("#contactForm").show("slow"); $("#contact_input_group").hide("slow")'><i class='bi bi-plus'></i></a>"""),
-                                        css_id="contact_input_group"),
-                                               css_class="col-md-6"),
-                                        Column(FieldWithButtons("company", HTML(
-                                            "<a role='button' class='btn btn-primary' href='%s' target='_blank'><i class='bi bi-plus'></i></a>" % reverse(
-                                                "crm:company"))),
-                                               css_class="col-md-6"),
-                                        css_class="row"),
-                                    )
+        self.inline_helper.layout = Layout(Div(
+            Column(FieldWithButtons("contact",
+                                    HTML("""<a role='button' class='btn btn-primary' href='#' onclick='$("#contactForm").show("slow"); $("#contact_input_group").hide("slow")'><i class='bi bi-plus'></i></a>"""),
+                                    css_id="contact_input_group"),
+                   css_class="col-md-6"),
+            Column(FieldWithButtons("company",
+                                    HTML("""<a role='button' class='btn btn-primary' href='#' onclick='$("#companyForm").show("slow"); $("#company_input_group").hide("slow")'><i class='bi bi-plus'></i></a>"""),
+                                    css_id="company_input_group"),
+                   css_class="col-md-6"),
+            css_class="row"))
 
 
 class BusinessBrokerForm(PydiciCrispyModelForm):

diff --git a/crm/views.py b/crm/views.py
@@ -107,15 +107,22 @@ def contact_list(request):
 def linked_mission_contact_create(request, mission_id):
     missionContactForm = None
     contactForm = None
+    companyForm = None
     if request.POST:
         missionContactForm = MissionContactForm(request.POST, prefix="mission-contact")
         contactForm = ContactForm(request.POST, prefix="contact")
+        companyForm = CompanyForm(request.POST, prefix="company")
 
         if contactForm.is_valid():
             contact = contactForm.save()
             missionContactForm.data = missionContactForm.data.copy()
             missionContactForm.data["mission-contact-contact"] = contact.id
 
+        if companyForm.is_valid():
+            company = companyForm.save()
+            missionContactForm.data = missionContactForm.data.copy()
+            missionContactForm.data["mission-contact-company"] = company.id
+
         if missionContactForm.is_valid():
             mission_contact = missionContactForm.save()
             mission = Mission.objects.get(id=mission_id)
@@ -126,7 +133,8 @@ def linked_mission_contact_create(request, mission_id):
 
     return render(request, "crm/_mission_contact_form.html", {"mission_id": mission_id,
                                                               "missionContactForm": missionContactForm or MissionContactForm(mission_id=mission_id, prefix="mission-contact"),
-                                                              "contactForm": contactForm or ContactForm(prefix="contact")})
+                                                              "contactForm": contactForm or ContactForm(prefix="contact"),
+                                                              "companyForm": companyForm or CompanyForm(prefix="company")})
 
 
 class MissionContactCreate(PydiciNonPublicdMixin, FeatureContactsWriteMixin, ContactReturnToMixin, CreateView):

diff --git a/templates/crm/_mission_contact_form.html b/templates/crm/_mission_contact_form.html
@@ -8,5 +8,6 @@
       novalidate>
     {% crispy missionContactForm missionContactForm.inline_helper %}
     {% crispy contactForm contactForm.inline_helper %}
+    {% crispy companyForm companyForm.inline_helper %}
     <input type="submit" name="submit" value="{% trans 'Save' %}" class="btn btn-primary">
 </form>