dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
mdipierro
2014-08-06 14:50:53 -05:00
parent 63529e5ad8 d1118b606b
commit d4e71073d7
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+16 -3
View File
@@ -2442,7 +2442,7 @@ class SQLFORM(FORM):
message = T('at least %(nrows)s records found') % dict(nrows=nrows) message = T('at least %(nrows)s records found') % dict(nrows=nrows)
else: else:
message = T('%(nrows)s records found') % dict(nrows=nrows) message = T('%(nrows)s records found') % dict(nrows=nrows)
console.append(DIV(message or T('None'), _class='web2py_counter')) console.append(DIV(message or '', _class='web2py_counter'))
paginator = UL() paginator = UL()
if paginate and dbset._db._adapter.dbengine == 'google:datastore': if paginate and dbset._db._adapter.dbengine == 'google:datastore':
@@ -2672,7 +2672,7 @@ class SQLFORM(FORM):
@staticmethod @staticmethod
def smartgrid(table, constraints=None, linked_tables=None, def smartgrid(table, constraints=None, linked_tables=None,
links=None, links_in_grid=True, links=None, links_in_grid=True, max_linked_inline=0,
args=None, user_signature=True, args=None, user_signature=True,
divider='>', breadcrumbs_class='', divider='>', breadcrumbs_class='',
**kwargs): **kwargs):
@@ -2814,6 +2814,8 @@ class SQLFORM(FORM):
linked_tables = linked_tables.get(table._tablename, []) linked_tables = linked_tables.get(table._tablename, [])
if linked_tables: if linked_tables:
for item in linked_tables: for item in linked_tables:
opts = [OPTION(T('References')+':', _value='')]
linked = []
tb = None tb = None
if isinstance(item, Table) and item._tablename in check: if isinstance(item, Table) and item._tablename in check:
tablename = item._tablename tablename = item._tablename
@@ -2835,11 +2837,22 @@ class SQLFORM(FORM):
t = T(tb._plural) if not multiple_links else \ t = T(tb._plural) if not multiple_links else \
T(tb._plural + '(' + fieldname + ')') T(tb._plural + '(' + fieldname + ')')
args0 = tablename + '.' + fieldname args0 = tablename + '.' + fieldname
links.append( opts.append(OPTION(t,_value=args0))
linked.append(
lambda row, t=t, nargs=nargs, args0=args0: lambda row, t=t, nargs=nargs, args0=args0:
A(SPAN(t), cid=request.cid, _href=url( A(SPAN(t), cid=request.cid, _href=url(
args=[args0, row[id_field_name]]))) args=[args0, row[id_field_name]])))
if 0 < max_linked_inline < len(opts)-1:
links.append(
lambda row:
SELECT(opts, cid=request.cid, _rowid=row[id_field_name],
_onchange="javascript:document.location='"+url()+
"/'+this.value+'/'+this.attributes['rowid'].value"
)
)
else: links += linked
grid = SQLFORM.grid(query, args=request.args[:nargs], links=links, grid = SQLFORM.grid(query, args=request.args[:nargs], links=links,
links_in_grid=links_in_grid, links_in_grid=links_in_grid,
user_signature=user_signature, **kwargs) user_signature=user_signature, **kwargs)