holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Etemplate: Include etemplate exec_id as sortable parameter

Browse Source
This commit is contained in:
nathangray 2020-11-04 15:15:31 -07:00
parent b3ed6372f7
commit 8b28d8ffd0
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/et2_widget_grid.js
View File

@ -714,7 +714,11 @@ var et2_grid = /** @class */ (function (_super) {
containment: this.options.sortable_containment, containment: this.options.sortable_containment,
connectWith: this.options.sortable_connectWith, connectWith: this.options.sortable_connectWith,
update: function (event, ui) { 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) { receive: function (event, ui) {
if (typeof self.sortable_recieveCallback == 'function') { if (typeof self.sortable_recieveCallback == 'function') {

5
api/js/etemplate/et2_widget_grid.ts
View File

@ -972,7 +972,10 @@ export class et2_grid extends et2_DOMWidget implements et2_IDetachedDOM, et2_IAl
containment: this.options.sortable_containment, containment: this.options.sortable_containment,
connectWith: this.options.sortable_connectWith, connectWith: this.options.sortable_connectWith,
update: function(event, ui) { 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, null,
self, self,
true true

2
mail/inc/class.mail_sieve.inc.php
View File

@ -892,7 +892,7 @@ class mail_sieve
* *
* @param {array} $orders * @param {array} $orders
*/ */
function ajax_moveRule($orders) function ajax_moveRule($exec_id, $orders)
{ {
foreach ($orders as $keys => $val) foreach ($orders as $keys => $val)