From 6b2c3f072045f3d6adc9c6e75f0e862aa7fbe4af Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 20 May 2014 14:07:53 +0200
Subject: [PATCH] Allow NestedModel and Object editors' form options to be
 extended/overridden.

---
 src/editors/nestedmodel.js | 14 ++++++++------
 src/editors/object.js      |  9 +++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/editors/nestedmodel.js b/src/editors/nestedmodel.js
index ebaac4e1..304a50cd 100644
--- a/src/editors/nestedmodel.js
+++ b/src/editors/nestedmodel.js
@@ -11,12 +11,12 @@ Form.editors.NestedModel = Form.editors.Object.extend({
     Form.editors.Base.prototype.initialize.call(this, options);
 
     if (!this.form) throw new Error('Missing required option "form"');
-    if (!options.schema.model) throw new Error('Missing required "schema.model" option for NestedModel editor');
+    if (!this.schema.model) throw new Error('Missing required "schema.model" option for NestedModel editor');
   },
 
   render: function() {
-    //Get the constructor for creating the nested form; i.e. the same constructor as used by the parent form
-    var NestedForm = this.form.constructor;
+    //Get the constructor for creating the nested form; by default the same constructor as used by the parent form
+    var NestedForm = this.schema.formClass || this.form.constructor;
 
     var data = this.value || {},
         key = this.key,
@@ -25,11 +25,13 @@ Form.editors.NestedModel = Form.editors.Object.extend({
     //Wrap the data in a model if it isn't already a model instance
     var modelInstance = (data.constructor === nestedModel) ? data : new nestedModel(data);
 
-    this.nestedForm = new NestedForm({
+    var formOptions = _.extend({
       model: modelInstance,
       idPrefix: this.id + '_',
-      fieldTemplate: 'nestedField'
-    });
+      Field: NestedForm.NestedField
+    }, _.result(this.schema, 'formOptions') || {});
+
+    this.nestedForm = new NestedForm(formOptions);
 
     this._observeFormEvents();
 
diff --git a/src/editors/object.js b/src/editors/object.js
index 4266f487..034d48d0 100644
--- a/src/editors/object.js
+++ b/src/editors/object.js
@@ -26,15 +26,16 @@ Form.editors.Object = Form.editors.Base.extend({
 
   render: function() {
     //Get the constructor for creating the nested form; i.e. the same constructor as used by the parent form
-    var NestedForm = this.form.constructor;
+    var NestedForm = this.schema.formClass || this.form.constructor;
 
-    //Create the nested form
-    this.nestedForm = new NestedForm({
+    var formOptions = _.extend({
       schema: this.schema.subSchema,
       data: this.value,
       idPrefix: this.id + '_',
       Field: NestedForm.NestedField
-    });
+    }, _.result(this.schema, 'formOptions') || {});
+
+    this.nestedForm = new NestedForm(formOptions);
 
     this._observeFormEvents();