From bc45e1e8f6d9e221fdf6cf0e81bb50ce6c67e91a Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <webmaster@web-t-sys.com>
Date: Thu, 8 Sep 2016 21:21:05 +0200
Subject: [PATCH] Fixes in webmodel for make set_conditions statement inline

---
 paramecio/citoplasma/base_admin.py | 10 +++++++++-
 paramecio/cromosoma/coreforms.py   | 11 +++++++++++
 paramecio/cromosoma/webmodel.py    |  2 ++
 tests/webmodeltest.py              | 21 +++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/paramecio/citoplasma/base_admin.py b/paramecio/citoplasma/base_admin.py
index b448ffa..64eb04e 100644
--- a/paramecio/citoplasma/base_admin.py
+++ b/paramecio/citoplasma/base_admin.py
@@ -49,4 +49,12 @@ def base_admin(func_view, env, title, **args):
         return t.load_template('admin/content.html', title=title, content_index=content_index, menu=menu, lang_selected=lang_selected, arr_i18n=I18n.dict_i18n)
         
     else:
-        redirect(make_url(config.admin_folder))
\ No newline at end of file
+        redirect(make_url(config.admin_folder))
+        
+def base_simple_admin(func_view, env, title, **args):
+    
+    if check_login():
+        
+        return func_view(connection, t, s, **args)
+    
+    
diff --git a/paramecio/cromosoma/coreforms.py b/paramecio/cromosoma/coreforms.py
index 8287a76..394ae4b 100644
--- a/paramecio/cromosoma/coreforms.py
+++ b/paramecio/cromosoma/coreforms.py
@@ -40,6 +40,17 @@ class BaseForm:
         
         return ""
 
+class SimpleTextForm(BaseForm):
+    
+    def __init__(self, name, value):
+        super().__init__(name, value)
+        
+        self.after_text=''
+    
+    def form(self):
+        
+        return super().form()+' '+self.after_text
+
 class TextForm(BaseForm):
     
     def __init__(self, name, value):
diff --git a/paramecio/cromosoma/webmodel.py b/paramecio/cromosoma/webmodel.py
index 58ef3a3..714dd83 100644
--- a/paramecio/cromosoma/webmodel.py
+++ b/paramecio/cromosoma/webmodel.py
@@ -596,6 +596,8 @@ class WebModel:
     def set_conditions(self, sql_text, values:list) -> None:
         
         self.conditions=[sql_text, values]
+        
+        return self
     
     def set_order(self, order:list, position:list) -> None:
         
diff --git a/tests/webmodeltest.py b/tests/webmodeltest.py
index 161fb88..910a183 100644
--- a/tests/webmodeltest.py
+++ b/tests/webmodeltest.py
@@ -162,7 +162,28 @@ class TestWebModelMethods(unittest.TestCase):
         self.assertTrue(model.drop())
         
         connection.close()
+    
+    def test_conditions(self):
         
+        print('Test conditions')
+        
+        connection=WebModel.connection()
+        model=ExampleModel(connection)
+        
+        sql=model.create_table()
+        
+        self.assertTrue(model.query(sql))
+        
+        cur=model.set_conditions('where id=%s', [4]).select()
+        
+        self.assertTrue(cur)
+        
+        cur.close()
+        
+        self.assertTrue(model.drop())
+        
+        connection.close()
+    
     def test_zcheck_1_foreignkeys(self):
         
         connection=WebModel.connection()