Fix handling of broken objects in ZMI #336
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
icemac
requested changes
Oct 2, 2018
src/OFS/zpt/main.zpt
Outdated
| rkey python:request.get('rkey','asc'); | ||
| rkey_alt python:request.get('rkey','asc')=='asc' and 'desc' or 'asc'; | ||
| sort_func python:['nocase','cmp'][skey not in ['getId','meta_type','id','title']]; | ||
| obs python:sequence.sort(obs, ((skey,sort_func,rkey),) )" | ||
| sort_func python:['strcoll','cmp'][skey not in ['meta_type','id','title']]; |
There was a problem hiding this comment.
'cmp' if skey in ['meta_type', 'id', 'title'] else 'strcoll' would be a bit easier to read in my mind.
src/OFS/zpt/main.zpt
Outdated
| (key, getattr(item[1],key)) | ||
| for key in ['title', 'meta_type'] | ||
| if hasattr(item[1],key) | ||
| ] |
There was a problem hiding this comment.
I think it would be easier to read when using if ... else None and filtering out None afterwards.
src/OFS/zpt/main.zpt
Outdated
| for item in here.objectItems() | ||
| ]; | ||
| obs python: [dict(item) for item in obs]; | ||
| obs python: sequence.sort(obs, ((skey,sort_func,rkey),), mapping=1 ); |
icemac
approved these changes
Oct 3, 2018
src/OFS/tests/testSorting.py
Outdated
| self.assertTrue(one_before_two == one_before_two_found) | ||
|
|
||
| self.browser.open(base_url % ('id', 'asc')) | ||
| do_assert(one_before_two = True) |
There was a problem hiding this comment.
PEP-8 does not allow spaces around = in function calls.
src/OFS/tests/testSorting.py
Outdated
| one_before_two_found = ( | ||
| self.browser.contents.find('File2') > self.browser.contents.find('File1') | ||
| ) | ||
| self.assertTrue(one_before_two == one_before_two_found) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of obtaining the list of objects from
objectValuesand assuming that these provide all necessary attributes (likegetId()), a list of dictionaries is created on the basis ofobjectItems, which has access to the object's ID as it is known to the parent. This is used for sorting as well as interaction with the specific items, so it allows to show broken objects and also delete them.fixes #311
fixes #213