From bb866ba24b3f57b5c2a7ccca5d9eb215b4cea0ac Mon Sep 17 00:00:00 2001
From: flothoni <florian.thonier.pro@gmail.com>
Date: Wed, 8 Apr 2020 16:58:20 +0200
Subject: [PATCH] server; add a empty calssification option

---
 .../applications/vidjil/controllers/config.py | 20 ++++++++++++-------
 .../applications/vidjil/views/config/add.html |  2 ++
 .../vidjil/views/config/edit.html             |  2 ++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/server/web2py/applications/vidjil/controllers/config.py b/server/web2py/applications/vidjil/controllers/config.py
index 4bacbd626..94ab41492 100644
--- a/server/web2py/applications/vidjil/controllers/config.py
+++ b/server/web2py/applications/vidjil/controllers/config.py
@@ -49,10 +49,12 @@ def add_form():
             error += field+" needed, "
 
     ## test if classification id exist
-    classification = db(db.classification.id ==  request.vars["config_classification"]).select()
-    if len(classification) == 0:
-        error += "classification id don't exist, "
-
+    if  request.vars["config_classification"] != "-1":
+        classification = db(db.classification.id ==  request.vars["config_classification"]).count()
+        if classification == 0:
+            error += "classification id don't exist, "
+    else :
+        request.vars["config_classification"] = None
 
     if error=="" :
         
@@ -111,9 +113,13 @@ def edit_form():
             error += field+" needed, "
     
     ## test if classification id exist
-    classification = db(db.classification.id ==  request.vars["config_classification"]).select()
-    if len(classification) == 0:
-        error += "classification id don't exist, "
+    if  request.vars["config_classification"] != "-1":
+        classification = db(db.classification.id ==  request.vars["config_classification"]).count()
+        if classification == 0:
+            error += "classification id don't exist, "
+    else :
+        request.vars["config_classification"] = None
+
 
     if error=="" :
 
diff --git a/server/web2py/applications/vidjil/views/config/add.html b/server/web2py/applications/vidjil/views/config/add.html
index 356a06fb3..d188ceeb9 100644
--- a/server/web2py/applications/vidjil/views/config/add.html
+++ b/server/web2py/applications/vidjil/views/config/add.html
@@ -11,6 +11,8 @@
             <tr>
                 <td> <label for="config_classification" id="config_classification__label">classification: </label> </td>
                 <td><select id="config_classification" name="config_classification">
+                        <option value="-1" title="No classification">---</option>
+
                         {{for class_elt in classification: }}
                             <option value="{{=class_elt.id}}" title="{{=class_elt.info}}">{{=class_elt.name}}</option>
                         {{pass}}
diff --git a/server/web2py/applications/vidjil/views/config/edit.html b/server/web2py/applications/vidjil/views/config/edit.html
index 7f0811510..17b922064 100644
--- a/server/web2py/applications/vidjil/views/config/edit.html
+++ b/server/web2py/applications/vidjil/views/config/edit.html
@@ -16,6 +16,8 @@ info = db.config[request.vars["id"]]
             <tr>
                 <td> <label for="config_classification" id="config_classification__label">classification: </label> </td>
                 <td><select id="config_classification" name="config_classification">
+                    <option value="-1" {{if None == info.classification:}}selected="selected"{{pass}} title="no classification">---</option>
+
                         {{for class_elt in classification: }}
                             <option value="{{=class_elt.id}}" {{if class_elt.id == info.classification:}}selected="selected"{{pass}} title="{{=class_elt.info}}">{{=class_elt.name}}</option>
                         {{pass}}
-- 
GitLab