wrong URL for encrypted backups (fix #268)

This commit is contained in:
ziirish 2018-06-04 15:02:26 +02:00
parent c116626e2a
commit db98679489
No known key found for this signature in database
GPG key ID: 72DB229A64B54E46
3 changed files with 20 additions and 16 deletions

View file

@ -159,7 +159,9 @@ $( document ).ready(function() {
}
};
toggleRestorationForms(tree);
$('#tree').on('fancytreeinit', function() {
toggleRestorationForms(tree);
});
$("input[name=search-tree]").keyup(function(e){
var n,

View file

@ -108,7 +108,7 @@ var _client_table = $('#table-client').DataTable( {
if (type === 'filter' || type === 'sort') {
return data.number;
}
return '<a href="{{ url_for("view.client_browse", name=cname, server=server) }}/'+data.number+(data.encrypted?'&encrypted=1':'')+'" style="color: inherit; text-decoration: inherit;">'+pad(data.number, 7)+'</a>';
return '<a href="{{ url_for("view.client_browse", name=cname, server=server) }}/'+data.number+(data.encrypted?'?encrypted=1':'')+'" style="color: inherit; text-decoration: inherit;">'+pad(data.number, 7)+'</a>';
}
},
{
@ -160,19 +160,6 @@ var _client_table = $('#table-client').DataTable( {
var first = true;
var _client = function() {
if (!__init_complete) {
return;
}
if (first) {
first = false;
} else {
if (!AJAX_CACHE) {
_cache_id = new Date().getTime();
}
_client_table.ajax.reload( null, false );
AJAX_CACHE = true;
}
url_restore = '{{ url_for("api.is_server_restore", name=cname, server=server) }}';
$.getJSON(url_restore, function(d) {
if (d.found) {
@ -200,6 +187,19 @@ var _client = function() {
}).fail(function() {
$('#controls').hide();
});
if (!__init_complete) {
return;
}
if (first) {
first = false;
} else {
if (!AJAX_CACHE) {
_cache_id = new Date().getTime();
}
_client_table.ajax.reload( null, false );
AJAX_CACHE = true;
}
};
{{ macros.page_length('#table-client') }}