diff --git a/app/labelsTower.py b/app/labelsTower.py index e250916bfc7574d2cf433cfe7f4b5c4a3ad41662..e8cf7c4e5dcc4f74e18c2372fac8e1388f965ad1 100644 --- a/app/labelsTower.py +++ b/app/labelsTower.py @@ -1,4 +1,3 @@ -import sqlite3 from update_labels import * from add_tutos import * from sql_request import * @@ -111,14 +110,5 @@ def add_new_tuto(): res = add_tuto(request.form['title'], request.form['link'], request.form['labels'], request.form['prescriber']) return render_template('add_new_tuto.html', status=res) -@app.route('/test') -def test(): - cursor = connection.cursor() - cursor.execute("SELECT * FROM labels") - res = cursor.fetchall() - connection.commit() - print(res) - return ("OK") - if __name__ == '__main__': app.run(host='0.0.0.0', port=80) \ No newline at end of file diff --git a/app/static/js/maj_tutorial.js b/app/static/js/maj_tutorial.js index 5d14fdc8422e847999f3da0465ca14e06cf837ed..6657f0f32429e7ef01642d80ee83c84c8ed0a911 100644 --- a/app/static/js/maj_tutorial.js +++ b/app/static/js/maj_tutorial.js @@ -88,7 +88,6 @@ function maj_results_after_remove() { * selected must have this two labels. */ join_labels = join_labels_from_old_tab(hierarchy.old_labels_tab); - console.log(join_labels); all_id_labels = JSON.parse(request_ajax("tuto_family/"+join_labels)); var all_id_labels_line = ""; for (var i = 0; all_id_labels[i]; i++) { @@ -97,7 +96,6 @@ function maj_results_after_remove() { all_id_labels_line += all_id_labels[i]['id_element']; } result.links_of_results = all_id_labels_line; - console.log(result.links_of_results); result.result_tab = JSON.parse(request_ajax("tutos/"+result.links_of_results)); del_unselect_language(); result.del_unselected_results(); diff --git a/app/templates/browse.html b/app/templates/browse.html index 06a5e67386b53993e80a0ee93a507430391ac38a..f441ce52b2d61c6171e06f58aa57c39ae8d9e760 100644 --- a/app/templates/browse.html +++ b/app/templates/browse.html @@ -406,10 +406,12 @@ if (lang[1] == 1) Vue.set(this.results_language, 1, this.results_language[1] + 1); update_loading(0); - if (hierarchy.old_labels_tab.length == 0) + if (hierarchy.old_labels_tab.length == 0 && hierarchy.unselect_tab.length == 0) hierarchy.reset(); - if (hierarchy.old_labels_tab.length > 0) + else if (hierarchy.old_labels_tab.length > 0) result.maj_results(3); + else if (hierarchy.unselect_tab.length > 0) + result.maj_results(4); del_unselect_language(); hierarchy.maj_new_labels_tab(); update_loading(1);