relikd/lektor-groupby-plugin
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix data model enumeration with no flow blocks

Browse Source
This commit is contained in:
relikd
2022-04-06 22:58:44 +02:00
parent c618ee458b
commit 16a26afdce
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lektor_groupby/watcher.py
View File

@@ -74,8 +74,10 @@ class GroupByModelReader:
''' '''
assert isinstance(record, Record) assert isinstance(record, Record)
for r_key, subs in self._models.get(record.datamodel.id, {}).items(): for r_key, subs in self._models.get(record.datamodel.id, {}).items():
field = record[r_key]
if not field:
continue
if subs == '*': # either normal field or flow type (all blocks) if subs == '*': # either normal field or flow type (all blocks)
field = record[r_key]
if flatten and isinstance(field, Flow): if flatten and isinstance(field, Flow):
for i, flow in enumerate(field.blocks): for i, flow in enumerate(field.blocks):
flowtype = flow['_flowblock'] flowtype = flow['_flowblock']
@@ -86,7 +88,7 @@ class GroupByModelReader:
else: else:
yield FieldKeyPath(r_key), field yield FieldKeyPath(r_key), field
else: # always flow type (only some blocks) else: # always flow type (only some blocks)
for i, flow in enumerate(record[r_key].blocks): for i, flow in enumerate(field.blocks):
flowtype = flow['_flowblock'] flowtype = flow['_flowblock']
for f_key in self._flows.get(flowtype, []): for f_key in self._flows.get(flowtype, []):
yield FieldKeyPath(r_key, i, f_key), flow[f_key] yield FieldKeyPath(r_key, i, f_key), flow[f_key]

1
setup.py
View File

@@ -27,7 +27,6 @@ setup(
'cluster', 'cluster',
], ],
classifiers=[ classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment', 'Environment :: Web Environment',
'Environment :: Plugins', 'Environment :: Plugins',
'Framework :: Lektor', 'Framework :: Lektor',