mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

[Advanced search] Adds dropdown if not exist when storing queries. Also removes dropdown if empty after delete.

pull/1223/head
Andreas 2021-10-11 19:36:52 +02:00
rodzic 9548386868
commit 5fbf307650
2 zmienionych plików z 23 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
application/views/interface_assets/footer.php
Wyświetl plik

@ -156,6 +156,18 @@ function load_was_map() {
.done(function(data) {
$(".alert").remove();
$(".card-body.main").append('<div class="alert alert-success"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Your query has been saved!</div>');
if ($("#querydropdown option").length == 0) {
var dropdowninfo = ' <button class="btn btn-sm btn-primary" onclick="edit_stored_query_dialog()" id="btn-edit">Edit queries</button></p>' +
'<div class="form-group row querydropdownform">' +
'<label class="col-md-2 control-label" for="querydropdown"> Stored queries:</label>' +
'<div class="col-md-3">' +
'<select id="querydropdown" name="querydropdown" class="form-control custom-select-sm">' +
'</select>' +
'</div>' +
'<button class="btn btn-sm btn-primary ld-ext-right runbutton" onclick="run_query()">Run Query<div class="ld ld-ring ld-spin"></div></button>' +
'</div>';
$("#btn-save").after(dropdowninfo);
}
$('#querydropdown').append(new Option(data.description, data.id)); // We add the saved query to the dropdown
});
}
@ -237,6 +249,10 @@ function load_was_map() {
$(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>The stored query has been deleted!</div>');
$("#query_" + id).remove(); // removes query from table in dialog
$("#querydropdown option[value='" + id + "']").remove(); // removes query from dropdown
if ($("#querydropdown option").length == 0) {
$("#btn-edit").remove();
$('.querydropdownform').remove();
};
},
error: function() {
$(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>The stored query could not be deleted. Please try again!</div>');
@ -274,7 +290,7 @@ function load_was_map() {
});
}
$('#btn-edit').on('click', function() {
function edit_stored_query_dialog() {
$(".alert").remove();
$.ajax({
url: base_url + 'index.php/search/get_stored_queries',
@ -295,7 +311,7 @@ function load_was_map() {
});
}
});
});
}
$('#btn-get').on('click', function() {
$(".alert").remove();

8
application/views/search/filter.php
Wyświetl plik

@ -37,10 +37,10 @@
<button style="display:none;" class="btn btn-sm btn-primary" id="btn-save">Save query</button>
<?php if ($stored_queries) { ?>
<button class="btn btn-sm btn-primary" id="btn-edit">Edit queries</button></p>
<button class="btn btn-sm btn-primary" onclick="edit_stored_query_dialog()" id="btn-edit">Edit queries</button></p>
<div class="form-group row">
<div class="form-group row querydropdownform">
<label class="col-md-2 control-label" for="querydropdown"> Stored queries:</label>
<div class="col-md-3">
<select id="querydropdown" name="querydropdown" class="form-control custom-select-sm">
@ -55,11 +55,13 @@
</div>
<?php
} else {
echo '</p>';
}
?>
<div style="display:none;"><span class="badge badge-info">Info</span> You can find out how to use the <a href="https://github.com/magicbug/Cloudlog/wiki/Search----Filter" target="_blank">search filter functions</a> in the wiki.</a></div>
</p>
</div>
</div>