Fixes in webmodel for make set_conditions statement inline

This commit is contained in:
Antonio de la Rosa 2016-09-08 21:21:05 +02:00
parent 4dfadfe1bd
commit bc45e1e8f6
4 changed files with 43 additions and 1 deletions

View file

@ -50,3 +50,11 @@ def base_admin(func_view, env, title, **args):
else:
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)

View file

@ -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):

View file

@ -597,6 +597,8 @@ class WebModel:
self.conditions=[sql_text, values]
return self
def set_order(self, order:list, position:list) -> None:
order=[]

View file

@ -163,6 +163,27 @@ class TestWebModelMethods(unittest.TestCase):
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()