From a460c8fdf4b238ce8fd48e608e4a9e01a06b8ae6 Mon Sep 17 00:00:00 2001
From: CyrilM <mammar@lal.in2p3.fr>
Date: Tue, 11 Dec 2018 14:09:23 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20d'un=20bug=20qui=20apparaisait=20l?=
=?UTF-8?q?orsque=20le=20tableau=20unselect=5Flabels=20=C3=A9tait=20rempli?=
=?UTF-8?q?s=20et=20le=20old=5Flabels=20vide=20et=20que=20l'on=20esayait?=
=?UTF-8?q?=20de=20changer=20la=20langue=20des=20tutoriels.=20Se=20produis?=
=?UTF-8?q?ait=20un=20reset.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/labelsTower.py | 10 ----------
app/static/js/maj_tutorial.js | 2 --
app/templates/browse.html | 6 ++++--
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/app/labelsTower.py b/app/labelsTower.py
index e250916..e8cf7c4 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 5d14fdc..6657f0f 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 06a5e67..f441ce5 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);
--
GitLab