CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

Removed typo in the number of remaining pastes to display in browseImportantPaste

pull/94/head
Mokaddem 2016-12-22 09:28:55 +01:00
parent 9df12cdae8
commit faa8f8302d
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/www/Flasks/Flask_browsepastes.py
View File

@ -79,9 +79,9 @@ def importantPasteByModule():
paste_linenum.append(paste.get_lines_info()[0]) paste_linenum.append(paste.get_lines_info()[0])
if len(allPastes) > 10: if len(allPastes) > 10:
finished = "" finished = False
else: else:
finished = "display: none;" finished = True
return render_template("important_paste_by_module.html", return render_template("important_paste_by_module.html",
moduleName=module_name, moduleName=module_name,

17
var/www/templates/important_paste_by_module.html
View File

@ -29,7 +29,7 @@
<div id="div_stil_data"> <div id="div_stil_data">
<button id="load_more_json_button1" type="button" class="btn btn-default" onclick="add_entries(100)" style="display: none">Load 100 entries</button> <button id="load_more_json_button1" type="button" class="btn btn-default" onclick="add_entries(100)" style="display: none">Load 100 entries</button>
<button id="load_more_json_button2" type="button" class="btn btn-warning" onclick="add_entries(300)" style="display: none">Load 300 entries</button> <button id="load_more_json_button2" type="button" class="btn btn-warning" onclick="add_entries(300)" style="display: none">Load 300 entries</button>
<img id="loading_gif_browse" src="{{url_for('static', filename='image/loading.gif') }}" heigt="20" width="20" style="margin: 2px; {{ finished }}"></div> <img id="loading_gif_browse" src="{{url_for('static', filename='image/loading.gif') }}" heigt="20" width="20" style="margin: 2px;"></div>
</br> </br>
@ -38,13 +38,15 @@
var json_array = []; var json_array = [];
var all_data_received = false; var all_data_received = false;
var curr_numElem; var curr_numElem;
var elem_added = 0; var elem_added = 10; //10 elements are added by default in the page loading
var tot_num_entry = 0; var tot_num_entry = 10; //10 elements are added by default in the page loading
function deploy_source() { function deploy_source() {
var button_load_more_displayed = false; var button_load_more_displayed = false;
if(typeof(EventSource) !== "undefined" && typeof(source) !== "") { if(typeof(EventSource) !== "undefined" && typeof(source) !== "") {
$("#load_more_json_button1").show();
$("#load_more_json_button2").show();
var source = new EventSource("{{ url_for('getImportantPasteByModule') }}"+"?moduleName="+moduleName); var source = new EventSource("{{ url_for('getImportantPasteByModule') }}"+"?moduleName="+moduleName);
source.onmessage = function(event) { source.onmessage = function(event) {
var feed = jQuery.parseJSON( event.data ); var feed = jQuery.parseJSON( event.data );
@ -52,8 +54,6 @@ function deploy_source() {
if (feed.index > curr_numElem & feed.module == moduleName) { // Avoid doubling the pastes if (feed.index > curr_numElem & feed.module == moduleName) { // Avoid doubling the pastes
json_array.push(feed); json_array.push(feed);
tot_num_entry++; tot_num_entry++;
$("#load_more_json_button1").show();
$("#load_more_json_button2").show();
$("#nbr_entry").text(tot_num_entry + " entries available, " + (tot_num_entry - elem_added) + " not displayed"); $("#nbr_entry").text(tot_num_entry + " entries available, " + (tot_num_entry - elem_added) + " not displayed");
$("#myTable_"+moduleName).attr('data-numElem', curr_numElem+1); $("#myTable_"+moduleName).attr('data-numElem', curr_numElem+1);
@ -125,7 +125,14 @@ $(document).ready(function(){
search_table = $('#myTable_'+moduleName).DataTable({ "order": [[ 2, "desc" ]] }); search_table = $('#myTable_'+moduleName).DataTable({ "order": [[ 2, "desc" ]] });
if( "{{ finished }}" == "True"){
$("#load_more_json_button1").hide();
$("#load_more_json_button2").hide();
$("#nbr_entry").hide();
$("#loading_gif_browse").hide();
} else {
deploy_source(); deploy_source();
}
}); });
</script> </script>