diff options
Diffstat (limited to 'ishtar_common/static/js')
-rw-r--r-- | ishtar_common/static/js/ishtar.js | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 9eae1b04d..326a4cb85 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -330,6 +330,7 @@ $(document).on("click", '#to_top_arrow', function(){ }); var bookmark_url = ""; +var bookmark_delete_url = "/bookmark/delete/"; var load_bookmark_list = function(){ if (!bookmark_url) return; @@ -337,9 +338,13 @@ var load_bookmark_list = function(){ var bookmark_list = ""; for (idx in data['bookmarks']){ var bookmark = data['bookmarks'][idx]; - bookmark_list += '<span class="dropdown-item input-link" ' + - 'data-query="' + bookmark['query'].replace(/"/g, "''") + - '" href="#">' + bookmark['label'] + '</span>'; + bookmark_list += '<span class="dropdown-item d-flex">' + + '<a data-query="' + bookmark['query'].replace(/"/g, "''") + + '" href="#" class="flex-grow-1 input-link">' + bookmark['label'] + + '</a>' + + '<a class="close" href="#" data-id="' + bookmark['id'] + '">' + + '<i class="fa fa-times text-danger" aria-hidden="true"></i>' + + '</a></span>'; } $('#bookmark-list').html(bookmark_list); if (!bookmark_list){ @@ -347,11 +352,17 @@ var load_bookmark_list = function(){ } else { $('#load-bookmark').removeClass('disabled'); } - $("#bookmark-list span").click(function(){ + $("#bookmark-list span a.input-link").click(function(){ $("#id_search_vector").val( $(this).attr('data-query').replace(/''/g, '"')); enable_save(); $(".search_button").click(); + return false; + }); + $("#bookmark-list span a.close").click(function(){ + var id = $(this).attr('data-id'); + dt_qa_open(bookmark_delete_url + id + '/'); + return false; }); }, 'json'); } @@ -811,6 +822,7 @@ var dt_qa_open = function (url){ close_wait(); } }); + return false; }; var ajax_post = function(url, data, target, callback){ @@ -835,6 +847,7 @@ var ajax_post = function(url, data, target, callback){ }; var qa_action_register = function(url) { + $('#qa-action').on('submit', function(event){ event.preventDefault(); $('#modal-dynamic-form').modal("hide"); |