From: Carsten S. <svn...@pl...> - 2009-04-26 21:23:19
|
Author: csenger Date: Sun Apr 26 21:23:13 2009 New Revision: 26688 Modified: plone.app.content/branches/1.x/docs/HISTORY.txt plone.app.content/branches/1.x/plone/app/content/browser/reviewlist.py Log: Correct detection if an item in the review list is folderish. Partiall fix for #8926 Modified: plone.app.content/branches/1.x/docs/HISTORY.txt ============================================================================== --- plone.app.content/branches/1.x/docs/HISTORY.txt (original) +++ plone.app.content/branches/1.x/docs/HISTORY.txt Sun Apr 26 21:23:13 2009 @@ -4,6 +4,10 @@ 1.4.1 - unreleased ------------------ +- Correct detection if an item in the review list is folderish. + Partially fixes http://dev.plone.org/plone/ticket/8926 + [csenger] + - Add authenticator token to full_review_list form. Partially fixes http://dev.plone.org/plone/ticket/8926 [csenger] Modified: plone.app.content/branches/1.x/plone/app/content/browser/reviewlist.py ============================================================================== --- plone.app.content/branches/1.x/plone/app/content/browser/reviewlist.py (original) +++ plone.app.content/branches/1.x/plone/app/content/browser/reviewlist.py Sun Apr 26 21:23:13 2009 @@ -80,7 +80,7 @@ obj_type = obj.portal_type if obj_type in use_view_action: view_url = url + '/view' - elif obj.is_folderish: + elif obj.is_folderish(): view_url = url + "/folder_contents" else: view_url = url @@ -106,7 +106,7 @@ obj_type), state_class = state_class, is_browser_default = is_browser_default, - folderish = obj.is_folderish, + folderish = obj.is_folderish(), relative_url = relative_url, view_url = view_url, table_row_class = table_row_class, |
From: Wichert A. <wi...@wi...> - 2009-04-29 10:15:06
|
Hi Carsten, Previously Carsten Senger wrote: > Author: csenger > Date: Sun Apr 26 21:23:13 2009 > New Revision: 26688 > > Modified: > plone.app.content/branches/1.x/docs/HISTORY.txt > plone.app.content/branches/1.x/plone/app/content/browser/reviewlist.py > Log: > Correct detection if an item in the review list is folderish. Partiall fix for #8926 can you merge this one and your other changes to trunk? Wichert. -- Wichert Akkerman <wi...@wi...> It is simple to make things. http://www.wiggy.net/ It is hard to make things simple. |
From: Wichert A. <wi...@wi...> - 2009-04-29 11:36:53
|
On 4/29/09 1:35 PM, Carsten Senger wrote: > Hi Wichert, > > Wichert Akkerman schrieb: >> Hi Carsten, >> >> Previously Carsten Senger wrote: >>> Author: csenger >>> Date: Sun Apr 26 21:23:13 2009 >>> New Revision: 26688 >>> >>> Modified: >>> plone.app.content/branches/1.x/docs/HISTORY.txt >>> >>> plone.app.content/branches/1.x/plone/app/content/browser/reviewlist.py >>> Log: >>> Correct detection if an item in the review list is folderish. >>> Partiall fix for #8926 >> >> can you merge this one and your other changes to trunk? >> >> Wichert. > > Sure. I left it be after I saw Hanno's batch merges. I'll catch up. It is everyone's repsonsibility to merge changes to all future branches. We can't rely on Hanno doing our work for us. There's only one of him, and he has plenty to do already! Wichert. |