Fixes in webmodel for make set_conditions statement inline
This commit is contained in:
parent
4dfadfe1bd
commit
bc45e1e8f6
4 changed files with 43 additions and 1 deletions
|
|
@ -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))
|
||||
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)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue