Skip to content

Commit 80885d7

Browse files
committed
Use new filtering for csv export variants
1 parent 8df5321 commit 80885d7

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

roundup/cgi/actions.py

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,13 +1706,9 @@ def fct(arg):
17061706
# generate the CSV output
17071707
self.client._socket_op(writer.writerow, columns)
17081708
# and search
1709-
for itemid in klass.filter(matches, filterspec, sort, group):
1709+
filter = klass.filter_with_permissions
1710+
for itemid in filter(matches, filterspec, sort, group):
17101711
row = []
1711-
# don't put out a row of [hidden] fields if the user has
1712-
# no access to the issue.
1713-
if not self.hasPermission(self.permissionType, itemid=itemid,
1714-
classname=request.classname):
1715-
continue
17161712
for name in columns:
17171713
# check permission for this property on this item
17181714
# TODO: Permission filter doesn't work for the 'user' class
@@ -1807,15 +1803,9 @@ def handle(self):
18071803
self.client._socket_op(writer.writerow, columns)
18081804

18091805
# and search
1810-
for itemid in klass.filter(matches, filterspec, sort, group):
1806+
filter = klass.filter_with_permissions
1807+
for itemid in filter(matches, filterspec, sort, group):
18111808
row = []
1812-
# FIXME should this code raise an exception if an item
1813-
# is included that can't be accessed? Enabling this
1814-
# check will just skip the row for the inaccessible item.
1815-
# This makes it act more like the web interface.
1816-
# if not self.hasPermission(self.permissionType, itemid=itemid,
1817-
# classname=request.classname):
1818-
# continue
18191809
for name in columns:
18201810
# check permission to view this property on this item
18211811
if not self.hasPermission(self.permissionType, itemid=itemid,

0 commit comments

Comments
 (0)