paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Many fixes for get related fields

Browse source
This commit is contained in:
Antonio de la Rosa 2016-08-22 05:41:26 +02:00
parent 611ef90567
commit 617a9fb87b
4 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
paramecio/citoplasma/lists.py
View file

@ -12,6 +12,8 @@ class SimpleList:
def __init__(self, model, url, t):
self.raw_query=True
self.getpostfiles=GetPostFiles()
self.getpostfiles.obtain_get()
@ -114,6 +116,14 @@ class SimpleList:
self.s['order_field']=field_k
for field in self.fields:
#Initialize foreignkeyfield fields too
if type(self.model.fields[field]).__name__=='ForeignKeyField':
name_related=self.model.fields[field].related_model.name
for k in self.model.fields[field].related_model.fields.keys():
self.change_order[name_related+'_'+k]=self.s['order']
self.change_order[field]=self.s['order']
if self.s['order']==0:
@ -157,12 +167,12 @@ class SimpleList:
def show(self):
self.model.yes_reset_conditions=False
self.obtain_order()
self.obtain_field_search()
self.model.yes_reset_conditions=False
self.search()
total_elements=self.model.select_count()
@ -177,7 +187,9 @@ class SimpleList:
self.model.limit='limit '+str(begin_page)+','+str(self.limit_pages)
list_items=self.model.select(self.fields, True)
list_items=self.model.select(self.fields, self.raw_query)
#print(self.model.fields.keys())
pages=Pages.show( begin_page, total_elements, num_elements, link ,initial_num_pages=self.initial_num_pages, variable='begin_page', label='', func_jscript='')

2
paramecio/citoplasma/templates/utils/list.phtml
View file

@ -30,7 +30,7 @@
<table class="table_list">
<tr class="title_list">
% for field in simplelist.fields_showed:
<td class="${simplelist.model.fields[field].name}_td"><a href="${add_get_parameters(simplelist.url, order_field=simplelist.model.fields[field].name, begin_page=simplelist.begin_page, order=simplelist.change_order[field], search_text=simplelist.search_text, search_field=simplelist.search_field)}" class="${set_css_arrow(simplelist, field)}">${simplelist.model.fields[field].label}</a></td>
<td class="${simplelist.model.fields[field].name}_td"><a href="${add_get_parameters(simplelist.url, order_field=field, begin_page=simplelist.begin_page, order=simplelist.change_order[field], search_text=simplelist.search_text, search_field=simplelist.search_field)}" class="${set_css_arrow(simplelist, field)}">${simplelist.model.fields[field].label}</a></td>
% endfor
% for extra_field in simplelist.arr_extra_fields:
<td class="options_td">${ extra_field }</td>