Browse Source

HUE-7786 [dashboard] Canceling adding a widget should not add an empty widget to Gridster

Enrico Berti 8 years ago
parent
commit
99c499f

+ 8 - 1
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -4048,6 +4048,13 @@ $(document).ready(function () {
       $("#addFacetDemiModal").modal("hide");
       $("#addFacetDemiModal").modal("hide");
     }
     }
   }
   }
+
+  function addFacetDemiModalFieldCancel() {
+    searchViewModel.gridItems.remove(selectedGridster);
+    searchViewModel.removeWidget(selectedWidget);
+    selectedRow = null;
+  }
+
   %else:
   %else:
   function showAddFacetDemiModal(widget, row) {
   function showAddFacetDemiModal(widget, row) {
     if (["resultset-widget", "html-resultset-widget", "filter-widget", "leafletmap-widget"].indexOf(widget.widgetType()) == -1) {
     if (["resultset-widget", "html-resultset-widget", "filter-widget", "leafletmap-widget"].indexOf(widget.widgetType()) == -1) {
@@ -4096,12 +4103,12 @@ $(document).ready(function () {
       }
       }
     }
     }
   }
   }
-  %endif
 
 
   function addFacetDemiModalFieldCancel() {
   function addFacetDemiModalFieldCancel() {
     searchViewModel.removeWidget(selectedWidget);
     searchViewModel.removeWidget(selectedWidget);
     selectedRow = null;
     selectedRow = null;
   }
   }
+  %endif
 
 
   $(document).on("setResultsHeight", function () {
   $(document).on("setResultsHeight", function () {
     $('.result-main').each(function(){
     $('.result-main').each(function(){