Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
erp5
Commits
4cf247ca
Commit
4cf247ca
authored
7 years ago
by
Ayush Tiwari
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SQLCatalog: Add function for returning filter_dict
And simplify manage_exportProperties function accordingly
parent
4a56d264
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
11 deletions
+7
-11
product/ZSQLCatalog/SQLCatalog.py
product/ZSQLCatalog/SQLCatalog.py
+7
-11
No files found.
product/ZSQLCatalog/SQLCatalog.py
View file @
4cf247ca
...
...
@@ -672,6 +672,9 @@ class Catalog(Folder,
def
_clearCaches
(
self
):
self
.
_cache_sequence_number
+=
1
def
_getFilterDict
(
self
):
return
self
.
filter_dict
security
.
declarePrivate
(
'getSQLCatalogRoleKeysList'
)
def
getSQLCatalogRoleKeysList
(
self
):
"""
...
...
@@ -741,16 +744,9 @@ class Catalog(Folder,
f
.
write
(
' </property>
\
n
'
)
# XXX Although filters are not properties, output filters here.
# XXX Ideally, filters should be properties in Z SQL Methods, shouldn't they?
if
hasattr
(
self
,
'filter_dict'
):
filter_list
=
[]
for
filter_id
in
self
.
filter_dict
.
keys
():
filter_definition
=
self
.
filter_dict
[
filter_id
]
filter_list
.
append
((
filter_id
,
filter_definition
))
# Sort for easy diff
filter_list
.
sort
(
key
=
lambda
x
:
x
[
0
])
for
filter_item
in
filter_list
:
filter_id
=
filter_item
[
0
]
filter_def
=
filter_item
[
1
]
filter_dict
=
self
.
_getFilterDict
()
if
filter_dict
:
for
filter_id
,
filter_def
in
sorted
(
filter_dict
.
iteritems
()):
if
not
filter_def
[
'filtered'
]:
# If a filter is not activated, no need to output it.
continue
...
...
@@ -1603,7 +1599,7 @@ class Catalog(Folder,
with
(
noReadOnlyTransactionCache
if
disable_cache
else
readOnlyTransactionCache
)():
filter_dict
=
self
.
filter_dict
filter_dict
=
self
.
_getFilterDict
()
catalogged_object_list_cache
=
{}
for
method_name
in
method_id_list
:
# We will check if there is an filter on this
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment