From 14bc0664544db895984ba681967213f85610cc5a Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 7 Nov 2017 16:25:57 +0100
Subject: [PATCH] Update for new tablednd compatibility

---
 ChangeLog                       | 2 ++
 htdocs/core/tpl/ajaxrow.tpl.php | 6 +++---
 htdocs/variants/list.php        | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa600bdacef..04e1c5fbcc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,8 @@ Following changes may create regressions for some external modules, but were nec
 * The parameter note into method cloture() is added at end of private note (previously in v6, it replaced)
 * The parameter $user is now mandatory for method createFromOrder and createFromPropal. 
 * Remove js library fileupload that was not used by core code.
+* Jquery plugin tableDnd updated. You now need to use decodeURI on the return value of tableDnDSerialize() 
+  and add 'td.' to the beginning of the dragHandle match string. 
 
 
 ***** ChangeLog for 6.0.3 compared to 6.0.2 *****
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index a5d8ab039b8..49d69d6afcb 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -46,8 +46,8 @@ $(document).ready(function(){
 		onDrop: function(table, row) {
 			var reloadpage = "<?php echo $forcereloadpage; ?>";
 			console.log("tableDND onDrop");
-			console.log($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize());
-			var roworder = cleanSerialize($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize());
+			console.log(decodeURI($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize()));
+			var roworder = cleanSerialize(decodeURI($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize()));
 			var table_element_line = "<?php echo $table_element_line; ?>";
 			var fk_element = "<?php echo $fk_element; ?>";
 			var element_id = "<?php echo $id; ?>";
@@ -75,7 +75,7 @@ $(document).ready(function(){
 					});
 		},
 		onDragClass: "dragClass",
-		dragHandle: "tdlineupdown"
+		dragHandle: "td.tdlineupdown"
 	});
     $(".tdlineupdown").hover( function() { $(this).addClass('showDragHandle'); },
     	function() { $(this).removeClass('showDragHandle'); }
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index ca9595da131..2e97dda0a04 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -81,7 +81,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 				onDrop: function(table, row) {
 					console.log('drop');
 					var reloadpage = "<?php echo $forcereloadpage; ?>";
-					var roworder = cleanSerialize($("#tablelines").tableDnDSerialize());
+					var roworder = cleanSerialize(decodeURI($("#tablelines").tableDnDSerialize()));
 					$.post("<?php echo DOL_URL_ROOT; ?>/variants/ajax/orderAttribute.php",
 						{
 							roworder: roworder
@@ -100,7 +100,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 						});
 				},
 				onDragClass: "dragClass",
-				dragHandle: "tdlineupdown"
+				dragHandle: "td.tdlineupdown"
 			});
 		});
 	</script>