From 8b28d8ffd0e87b4a779bb2de14f2e837da712084 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Wed, 4 Nov 2020 15:15:31 -0700
Subject: [PATCH] Etemplate: Include etemplate exec_id as sortable parameter

---
 api/js/etemplate/et2_widget_grid.js | 6 +++++-
 api/js/etemplate/et2_widget_grid.ts | 5 ++++-
 mail/inc/class.mail_sieve.inc.php   | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/api/js/etemplate/et2_widget_grid.js b/api/js/etemplate/et2_widget_grid.js
index 6fca8b7200..115cb97998 100644
--- a/api/js/etemplate/et2_widget_grid.js
+++ b/api/js/etemplate/et2_widget_grid.js
@@ -714,7 +714,11 @@ var et2_grid = /** @class */ (function (_super) {
             containment: this.options.sortable_containment,
             connectWith: this.options.sortable_connectWith,
             update: function (event, ui) {
-                self.egw().json(sortable, [$node.sortable("toArray"), self.id], null, self, true).sendRequest();
+                self.egw().json(sortable, [
+                    self.getInstanceManager().etemplate_exec_id,
+                    $node.sortable("toArray"),
+                    self.id
+                ], null, self, true).sendRequest();
             },
             receive: function (event, ui) {
                 if (typeof self.sortable_recieveCallback == 'function') {
diff --git a/api/js/etemplate/et2_widget_grid.ts b/api/js/etemplate/et2_widget_grid.ts
index 1fcf73394e..57698e6a69 100644
--- a/api/js/etemplate/et2_widget_grid.ts
+++ b/api/js/etemplate/et2_widget_grid.ts
@@ -972,7 +972,10 @@ export class et2_grid extends et2_DOMWidget implements et2_IDetachedDOM, et2_IAl
 			containment: this.options.sortable_containment,
 			connectWith: this.options.sortable_connectWith,
 			update: function(event, ui) {
-				self.egw().json(sortable,[$node.sortable("toArray"), self.id],
+				self.egw().json(sortable,[
+					self.getInstanceManager().etemplate_exec_id,
+					$node.sortable("toArray"),
+					self.id],
 					null,
 					self,
 					true
diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php
index 84295fe5fc..a803e2b70a 100644
--- a/mail/inc/class.mail_sieve.inc.php
+++ b/mail/inc/class.mail_sieve.inc.php
@@ -892,7 +892,7 @@ class mail_sieve
 	 *
 	 * @param {array} $orders
 	 */
-	function ajax_moveRule($orders)
+	function ajax_moveRule($exec_id, $orders)
 	{
 
 		foreach ($orders as $keys => $val)