From 001a9f92ffe1c34161863478160ffb499ccefc10 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Tue, 16 Sep 2014 17:40:06 +1000
Subject: [PATCH] Fixes manage form so widgets fileupload can work correctly
 inside

---
 .../backend/behaviors/RelationController.php  |  2 +-
 .../partials/_manage_form.htm                 | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 5fa140ecc..5d39e3d42 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -462,7 +462,7 @@ class RelationController extends ControllerBehavior
         $this->beforeAjax();
 
         $saveData = $this->manageWidget->getSaveData();
-        $this->relationObject->find($this->manageId)->save($saveData);
+        $this->relationObject->find($this->manageId)->save($saveData, $this->relationGetSessionKey());
 
         return ['#'.$this->relationGetId('view') => $this->relationRenderView()];
     }
diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm b/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm
index a29cc76fa..fcd03ef44 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm
+++ b/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm
@@ -1,9 +1,11 @@
 <?php if ($relationManageId): ?>
 
-    <?= Form::ajax('onRelationManageUpdate', [
-        'data' => ['_relation_field' => $relationField, 'manage_id' => $relationManageId],
-        'data-stripe-load-indicator' => true
-    ]) ?>
+    <?= Form::ajax('onRelationManageUpdate', ['data-stripe-load-indicator' => true]) ?>
+
+        <!-- Passable fields -->
+        <input type="hidden" name="_relation_field" value="<?= $relationField ?>" />
+        <input type="hidden" name="manage_id" value="<?= $relationManageId ?>" />
+
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
             <h4 class="modal-title">
@@ -33,10 +35,11 @@
 
 <?php else: ?>
 
-    <?= Form::ajax('onRelationManageCreate', [
-        'data' => ['_relation_field' => $relationField],
-        'data-stripe-load-indicator' => true
-    ]) ?>
+    <?= Form::ajax('onRelationManageCreate', ['data-stripe-load-indicator' => true]) ?>
+
+        <!-- Passable fields -->
+        <input type="hidden" name="_relation_field" value="<?= $relationField ?>" />
+
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
             <h4 class="modal-title">