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

show computed fields in readonly mode in appadmin

Browse Source
This commit is contained in:
mdipierro
2017-11-08 00:40:47 -06:00
parent c4e08eeeb3
commit 2f5eb409b6
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/populate.py
+2
View File
@@ -137,6 +137,8 @@ def populate_generator(table, default=True, compute=False, contents={}):
continue continue
elif field.type == 'upload': elif field.type == 'upload':
continue continue
elif field.compute is not None:
continue
elif default and not field.default in (None, ''): elif default and not field.default in (None, ''):
record[fieldname] = field.default record[fieldname] = field.default
elif compute and field.compute: elif compute and field.compute:
gluon/packages/dal
+1 -1
Submodule gluon/packages/dal updated: f9f0fdfc9a...35dd4fc6f8
gluon/sqlhtml.py
+3 -3
View File
@@ -1244,8 +1244,8 @@ class SQLFORM(FORM):
# will only use writable or readable fields, unless forced to ignore # will only use writable or readable fields, unless forced to ignore
if fields is None: if fields is None:
fields = [f.name for f in table if fields = [f.name for f in table if
(ignore_rw or f.writable or f.readable) and (ignore_rw or f.writable or f.readable) and
(readonly or not f.compute)] not (f.compute and not record)]
self.fields = fields self.fields = fields
# make sure we have an id # make sure we have an id
@@ -1328,7 +1328,7 @@ class SQLFORM(FORM):
label = LABEL(label, label and sep, _for=field_id, label = LABEL(label, label and sep, _for=field_id,
_id=field_id + SQLFORM.ID_LABEL_SUFFIX) _id=field_id + SQLFORM.ID_LABEL_SUFFIX)
cond = readonly or \ cond = readonly or field.compute or \
(not ignore_rw and not field.writable and field.readable) (not ignore_rw and not field.writable and field.readable)
if cond: if cond: