From 455a653b5a01f4ee865e69b9a75f27f2f69762a1 Mon Sep 17 00:00:00 2001
From: Jake Bentvelzen <jake@silverstripe.com.au>
Date: Wed, 4 Jan 2017 17:05:14 +1100
Subject: [PATCH 1/3] feat(QuickAddNew): Add functionality so the action can be
 overwritten.

---
 code/extensions/QuickAddNewExtension.php | 29 ++++++++++++++++++++++++
 javascript/quickaddnew.js                | 13 +++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/code/extensions/QuickAddNewExtension.php b/code/extensions/QuickAddNewExtension.php
index 2c0b3fa..0b4e610 100644
--- a/code/extensions/QuickAddNewExtension.php
+++ b/code/extensions/QuickAddNewExtension.php
@@ -7,12 +7,20 @@
  **/
 class QuickAddNewExtension extends Extension
 {
+    /**
+     * @var boolean
+     */
+    protected $addNewEnabled = false;
 
     /**
      * @var FieldList
      **/
     protected $addNewFields;
 
+    /**
+     * @var string
+     */
+    protected $addNewAction;
 
     /**
      * @var string
@@ -98,6 +106,7 @@ public function useAddNew(
         }
 
         $this->owner->addExtraClass('quickaddnew-field');
+        $this->addNewEnabled = true;
 
         $this->sourceCallback        = $sourceCallback;
         $this->isFrontend            = $isFrontend;
@@ -108,6 +117,26 @@ public function useAddNew(
         return $this->owner;
     }
 
+    /**
+     * @return boolean
+     */
+    public function hasAddNewButton() {
+        return $this->addNewEnabled;
+    }
+
+    /**
+     *
+     */
+    public function updateAttributes(&$attributes) {
+        if (!$this->addNewFields) {
+            // Ignore if not using QuickAddNew
+            return;
+        }
+        $action = $this->owner->Link('AddNewFormHTML');
+        // Remove [] for ListboxSetField/CheckboxSetField
+        $action = preg_replace("/[\[\]']+/", "", $action);
+        $attributes['data-quickaddnew-action'] = $action;
+    }
 
     /**
      * The AddNewForm for the dialog window
diff --git a/javascript/quickaddnew.js b/javascript/quickaddnew.js
index 24b4359..be41a33 100644
--- a/javascript/quickaddnew.js
+++ b/javascript/quickaddnew.js
@@ -43,8 +43,17 @@ jQuery.entwine("quickaddnew", function($) {
 			var fieldName = this.attr('name');
 			if (this.hasClass('checkboxset')) fieldName = this.find('input:checkbox').attr('name').replace(/\[[0-9]+\]/g, '');
 			var action = this.parents('form').attr('action').split('?', 2); //add support for url parameters e.g. ?locale=en_US when using Translatable
-			var dialogHTMLURL =  action[0] + '/field/' + fieldName + '/AddNewFormHTML' + '?' + action[1];
-			this.setURL(dialogHTMLURL.replace(/[\[\]']+/g,''));
+			
+			var dialogHTMLURL = this.data('quickaddnew-action');
+			if (!dialogHTMLURL) {
+				// Fallback to default action
+				dialogHTMLURL = action[0] + '/field/' + fieldName + '/AddNewFormHTML';
+			}
+			if (action[1]) {
+				dialogHTMLURL += '?' + action[1];
+			}
+			dialogHTMLURL = dialogHTMLURL.replace(/[\[\]']+/g,'');
+			this.setURL(dialogHTMLURL);
 
 			// configure the dialog
 			this.getDialog().data("field", this).dialog({

From b3f4b705aa50a0641faf9f18b8bff15160eb0dc6 Mon Sep 17 00:00:00 2001
From: Jake Bentvelzen <jake@silverstripe.com.au>
Date: Thu, 5 Jan 2017 14:47:17 +1100
Subject: [PATCH 2/3] feat(JavaScript): Change submit button to change state on
 submit (fixes bug where button disables for HTML5 validation), If field
 updating is a <select> type, replace it's <option> elements and trigger an
 update for Chosen/Select2 (avoid losing JS hooks on a form on the frontend),
 Add missing this._super()  calls (fixes select2 not working when a
 quickaddnew button is added via AJAX)

---
 code/extensions/QuickAddNewExtension.php | 10 +++++-
 javascript/quickaddnew.js                | 41 +++++++++++++++++-------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/code/extensions/QuickAddNewExtension.php b/code/extensions/QuickAddNewExtension.php
index 0b4e610..518d6aa 100644
--- a/code/extensions/QuickAddNewExtension.php
+++ b/code/extensions/QuickAddNewExtension.php
@@ -132,6 +132,13 @@ public function updateAttributes(&$attributes) {
             // Ignore if not using QuickAddNew
             return;
         }
+        // NOTE(Jake): This below comment will be necessary if 
+        //             $this->owner->setForm($form); is needed in 'doAddNew'
+        /*$form = $this->owner->getForm();
+        if ($this->owner === $form->getController()) {
+            // Ignore action to avoid cyclic calls with Link() function
+            return;
+        }*/
         $action = $this->owner->Link('AddNewFormHTML');
         // Remove [] for ListboxSetField/CheckboxSetField
         $action = preg_replace("/[\[\]']+/", "", $action);
@@ -208,7 +215,8 @@ public function doAddNew($data, $form)
         }
 
         $this->owner->setValue($value);
-        $this->owner->setForm($form);
+        // NOTE(Jake): Below line causes cyclic issues, I assume it's not necessary.
+        //$this->owner->setForm($form);
         return $this->owner->FieldHolder();
     }
 
diff --git a/javascript/quickaddnew.js b/javascript/quickaddnew.js
index be41a33..00f1744 100644
--- a/javascript/quickaddnew.js
+++ b/javascript/quickaddnew.js
@@ -64,39 +64,55 @@ jQuery.entwine("quickaddnew", function($) {
 				position: 	{ my: "center", at: "center", of: window }
 			});
 
-			// submit button loading state while form is submitting
-			this.getDialog().on("click", "button", function() {
-				$(this).addClass("loading ui-state-disabled");
-			});
-
 			// handle dialog form submission
 			this.getDialog().on("submit", "form", function() {
 
 				var dlg = self.getDialog().dialog(),
 					options = {};
 
+				var $submitButtons = $(this).find('input[type="submit"], button[type="submit"]');
+				$submitButtons.addClass("loading ui-state-disabled");
+
 				// if this is a multiselect field, send the existing values
 				// along with the form submission so they can be included in the
 				// replacement field
 				if(self.val() && typeof self.val() === 'object'){
 					options.data = {
 						existing : self.val().join(',')
-					}
+					};
 				}
 
-				options.success = function(response) {
-					if($(response).is(".field")) {
-						self.getDialog().empty().dialog("close");
-						self.parents('.field:first').replaceWith(response);
+				options.success = function(res) {
+					var $response = $(res);
+					if($response.is('.field')) {
+						self.getDialog().empty().dialog('close');
+						var $newInput = $response.find(self[0].tagName);
+						// Replace <select> <option>'s rather than the entire HTML block
+						// to avoid JS hooks being lost on the frontend.
+						if ($newInput[0] && $newInput[0].tagName === 'SELECT') {
+							self.html($newInput.children());
+
+							// Support legacy and new chosen
+							self.trigger('liszt:updated').trigger('chosen:updated');
+							// Support select2
+							self.trigger('change.select2');
+						} else {
+							self.parents('.field:first').replaceWith(res);
+						}
 					} else {
-						self.getDialog().html(response);
+						self.getDialog().html(res);
 					}
-				}
+				};
+				options.complete = function() {
+					$submitButtons.removeClass("loading ui-state-disabled");
+				};
 
 				$(this).ajaxSubmit(options);
 
 				return false;
 			});
+
+			this._super();
 		},
 
 		showDialog: function(url) {
@@ -111,6 +127,7 @@ jQuery.entwine("quickaddnew", function($) {
 					dlg.find('form :input:visible:enabled:first').focus();
 				});
 			}
+			this._super();
 		}
 	});
 });

From 2335a138751c1699d063d06ce6d9f2ebb6ed22fe Mon Sep 17 00:00:00 2001
From: Jake Bentvelzen <jake@silverstripe.com.au>
Date: Thu, 6 Apr 2017 17:04:33 +1000
Subject: [PATCH 3/3] refactor(QuickAddNewExtension): Remove unused property

---
 code/extensions/QuickAddNewExtension.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/extensions/QuickAddNewExtension.php b/code/extensions/QuickAddNewExtension.php
index 518d6aa..7c3a66f 100644
--- a/code/extensions/QuickAddNewExtension.php
+++ b/code/extensions/QuickAddNewExtension.php
@@ -17,11 +17,6 @@ class QuickAddNewExtension extends Extension
      **/
     protected $addNewFields;
 
-    /**
-     * @var string
-     */
-    protected $addNewAction;
-
     /**
      * @var string
      **/