瀏覽代碼

HUE-7949 [dashboard] Disable dropping outside an empty widget when in Query Builder mode

Enrico Berti 7 年之前
父節點
當前提交
ed85bd4
共有 1 個文件被更改,包括 7 次插入3 次删除
  1. 7 3
      desktop/libs/dashboard/src/dashboard/templates/common_search.mako

+ 7 - 3
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -4093,10 +4093,14 @@ $(document).ready(function () {
     }
     }
   }, 'dashboard');
   }, 'dashboard');
 
 
-  huePubSub.subscribe('dashboard.top.widget.drag', movePreviewHolder, 'dashboard');
+  huePubSub.subscribe('dashboard.top.widget.drag', function(options) {
+    if (!searchViewModel.isQueryBuilder()) {
+      movePreviewHolder(options);
+    }
+  }, 'dashboard');
 
 
   huePubSub.subscribe('draggable.text.drag', function(options) {
   huePubSub.subscribe('draggable.text.drag', function(options) {
-    if (searchViewModel.isGridster()) {
+    if (searchViewModel.isGridster() && !searchViewModel.isQueryBuilder()) {
       movePreviewHolder(options);
       movePreviewHolder(options);
     }
     }
   }, 'dashboard');
   }, 'dashboard');
@@ -4406,7 +4410,7 @@ $(document).ready(function () {
   $('#searchComponents').parents('.embeddable').droppable({
   $('#searchComponents').parents('.embeddable').droppable({
     accept: '.draggable-widget, .draggableText',
     accept: '.draggable-widget, .draggableText',
     drop: function( event, ui ) {
     drop: function( event, ui ) {
-      if (searchViewModel.isGridster()) {
+      if (searchViewModel.isGridster() && !searchViewModel.isQueryBuilder()) {
         huePubSub.publish('dashboard.drop.on.page', {event: event, ui: ui});
         huePubSub.publish('dashboard.drop.on.page', {event: event, ui: ui});
       }
       }
     }
     }