Fixes in lists for use get environment and not sessions
This commit is contained in:
parent
373c58ade7
commit
a63abde3be
1 changed files with 18 additions and 11 deletions
|
|
@ -4,6 +4,7 @@ from paramecio.citoplasma.pages import Pages
|
||||||
from paramecio.citoplasma.urls import add_get_parameters
|
from paramecio.citoplasma.urls import add_get_parameters
|
||||||
from paramecio.citoplasma.sessions import get_session
|
from paramecio.citoplasma.sessions import get_session
|
||||||
from paramecio.citoplasma.i18n import I18n
|
from paramecio.citoplasma.i18n import I18n
|
||||||
|
from paramecio.citoplasma.httputils import GetPostFiles
|
||||||
from bottle import request
|
from bottle import request
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
@ -11,6 +12,10 @@ class SimpleList:
|
||||||
|
|
||||||
def __init__(self, model, url, t):
|
def __init__(self, model, url, t):
|
||||||
|
|
||||||
|
self.getpostfiles=GetPostFiles()
|
||||||
|
|
||||||
|
self.getpostfiles.obtain_get()
|
||||||
|
|
||||||
self.t=t
|
self.t=t
|
||||||
|
|
||||||
self.model=model
|
self.model=model
|
||||||
|
|
@ -35,7 +40,7 @@ class SimpleList:
|
||||||
|
|
||||||
#clean session
|
#clean session
|
||||||
|
|
||||||
self.s['order']=0
|
self.s['order']='0'
|
||||||
|
|
||||||
self.s['order_field']=self.model.name_field_id
|
self.s['order_field']=self.model.name_field_id
|
||||||
|
|
||||||
|
|
@ -76,15 +81,15 @@ class SimpleList:
|
||||||
|
|
||||||
def obtain_order(self):
|
def obtain_order(self):
|
||||||
|
|
||||||
self.s['order']=self.s.get('order', 0)
|
self.s['order']=self.getpostfiles.get.get('order', self.s['order'])
|
||||||
|
|
||||||
order_k=self.s['order']
|
order_k=int(self.s['order'])
|
||||||
|
|
||||||
#Obtain from get
|
#Obtain from get
|
||||||
|
"""
|
||||||
if 'order' in request.query.keys():
|
if 'order' in request.query.keys():
|
||||||
|
"""
|
||||||
order_k=int(request.query.get('order', 0))
|
#order_k=int(request.query.get('order', 0))
|
||||||
|
|
||||||
if order_k>1 or order_k<0:
|
if order_k>1 or order_k<0:
|
||||||
order_k=0
|
order_k=0
|
||||||
|
|
@ -95,12 +100,14 @@ class SimpleList:
|
||||||
|
|
||||||
def obtain_field_search(self):
|
def obtain_field_search(self):
|
||||||
|
|
||||||
self.s['order_field']=self.s.get('order_field', self.model.name_field_id)
|
self.s['order_field']=self.getpostfiles.get.get('order_field', self.s['order_field'])
|
||||||
|
|
||||||
field_k=self.s['order_field']
|
field_k=self.s['order_field']
|
||||||
|
|
||||||
|
"""
|
||||||
if 'order_field' in request.query.keys():
|
if 'order_field' in request.query.keys():
|
||||||
field_k=request.query.order_field
|
field_k=request.query.order_field
|
||||||
|
"""
|
||||||
|
|
||||||
if field_k in self.model.fields.keys():
|
if field_k in self.model.fields.keys():
|
||||||
|
|
||||||
|
|
@ -118,15 +125,15 @@ class SimpleList:
|
||||||
|
|
||||||
def search(self):
|
def search(self):
|
||||||
|
|
||||||
request.query.get('search_text', '')
|
self.getpostfiles.get['search_text']=self.getpostfiles.get.get('search_text', '')
|
||||||
|
|
||||||
self.search_text=request.query.search_text
|
self.search_text=self.getpostfiles.get['search_text']
|
||||||
|
|
||||||
self.search_text=self.search_text.replace('"', '"')
|
self.search_text=self.search_text.replace('"', '"')
|
||||||
|
|
||||||
#self.model.conditions='AND
|
#self.model.conditions='AND
|
||||||
|
|
||||||
self.search_field=request.query.get('search_field', '')
|
self.search_field=self.getpostfiles.get.get('search_field', '')
|
||||||
|
|
||||||
if self.search_field not in self.model.fields.keys():
|
if self.search_field not in self.model.fields.keys():
|
||||||
self.search_field=''
|
self.search_field=''
|
||||||
|
|
@ -162,7 +169,7 @@ class SimpleList:
|
||||||
|
|
||||||
num_elements=self.limit_pages
|
num_elements=self.limit_pages
|
||||||
|
|
||||||
link=add_get_parameters(self.url, search_text=self.search_text, search_field=self.search_field)
|
link=add_get_parameters(self.url, search_text=self.search_text, search_field=self.search_field, order=self.s['order'])
|
||||||
|
|
||||||
begin_page=self.begin_page
|
begin_page=self.begin_page
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue