From 913fc268cce54d9863150d33237a573798e13483 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Mon, 27 Feb 2017 05:56:25 +0100 Subject: [PATCH] Fix in order_by webmodel --- paramecio/cromosoma/webmodel.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/paramecio/cromosoma/webmodel.py b/paramecio/cromosoma/webmodel.py index 5eb6a66..ebd8142 100644 --- a/paramecio/cromosoma/webmodel.py +++ b/paramecio/cromosoma/webmodel.py @@ -785,26 +785,34 @@ class WebModel: result.close() return False - def set_conditions(self, sql_text, values:list) -> None: + def set_conditions(self, sql_text, values:list) -> object: self.conditions=[sql_text, values] return self - def set_order(self, order:list, position:list) -> None: + def set_order(self, order:dict) -> object: - order=[] + arr_order=[] + arr_order.append('ASC') + arr_order.append('DESC') - for o in enumerate(order): - - order.append('order by '+order[o]+' '+position[o]) + final_order=[] + + for o,v in order.items(): + + if o in self.fields: + + final_order.append('order by '+o+' '+arr_order[v]) - self.order=", ".join(order) + self.order_by=", ".join(final_order) return self def set_limit(self, limit: tuple) -> None: + limit[0]=int(limit[0]) + sql_limit=str(limit[0]) if len(limit)>1: