From 726177f4f7c22b8d7f207d4742fa310233e1175a Mon Sep 17 00:00:00 2001
From: "karel.picman@lbcfree.net" <karel.picman@lbcfree.net>
Date: Tue, 25 Aug 2020 13:51:55 +0200
Subject: [PATCH] Drag&Drop in Chrome

---
 app/controllers/dmsf_controller.rb |  2 +-
 app/views/dmsf/_query_rows.erb     | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index cd1e596a..e2bd9777 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -410,7 +410,7 @@ class DmsfController < ApplicationController
           if object && dmsf_folder
             if dmsf_folder == object.dmsf_folder
               object.errors[:base] << l(:error_target_folder_same)
-            elsif object.dmsf_folder.locked_for_user?
+            elsif object.dmsf_folder&.locked_for_user?
               object.errors[:base] << l(:error_folder_is_locked)
             else
               result = object.move_to(dmsf_folder.project, dmsf_folder)
diff --git a/app/views/dmsf/_query_rows.erb b/app/views/dmsf/_query_rows.erb
index a973618f..5685e4f9 100644
--- a/app/views/dmsf/_query_rows.erb
+++ b/app/views/dmsf/_query_rows.erb
@@ -50,12 +50,21 @@
 
 <% unless query.deleted %>
   <%= late_javascript_tag do %>
-    $(function() {
       $(".dmsf-draggable").draggable({
+        helper: function(event, ui) {
+          var ret = $(this).clone();
+          var width = $(this)[0].offsetWidth;
+          var myHelper = [];
+          myHelper.push('<table style="width: ' + width + 'px; background-color: #ffffdd;">');
+          myHelper.push(ret.html());
+          myHelper.push('</table>');
+          helper = myHelper.join('');
+          return helper;
+        },
         axis: "y",
-        revert: "invalid",
-        zIndex: 100
+        revert: "invalid"
       });
+
       $(".dmsf-droppable" ).droppable({
         drop: function(event, ui) {
           var handle = $(this);