From: Benoît Pin Date: Sun, 8 Dec 2013 21:37:50 +0000 (+0100) Subject: Simplifications. On vire le pictogramme du cadenas : personne ne savait à quoi ça... X-Git-Url: https://scm.cri.mines-paristech.fr/git/Plinn.git/commitdiff_plain/06261d4b9b1c430f52d16d789583212919aa2e96 Simplifications. On vire le pictogramme du cadenas : personne ne savait à quoi ça servait… Tests plus basiques sur l’affichage des cases à cocher / des boutons. --- diff --git a/skins/photo_theme/folder_contents.py b/skins/photo_theme/folder_contents.py index 714b8f1..b63159f 100755 --- a/skins/photo_theme/folder_contents.py +++ b/skins/photo_theme/folder_contents.py @@ -15,6 +15,7 @@ from Products.CMFDefault.utils import html_marshal mtool = getToolByName(script, 'portal_membership') checkPermission = mtool.checkPermission +isAnon = mtool.isAnonymousUser() utool = getToolByName(script, 'portal_url') portal_url = utool() @@ -94,11 +95,7 @@ elif (key, reverse) == context.getDefaultSorting(): else: is_default = 0 -columns = ( {'key': 'Lock', - 'title': '', - 'width': '16', - 'colspan': None} - , {'key': 'Type', +columns = ( {'key': 'Type', 'title': 'Type', 'width': None, 'colspan': '2'} @@ -110,10 +107,6 @@ columns = ( {'key': 'Lock', 'title': 'Last Modified', 'width': None, 'colspan': None} - # , {'key': 'position', - # 'title': 'Position', - # 'width': None, - # 'colspan': None } ) for column in columns: @@ -161,18 +154,13 @@ sortFunc = key in ['Type'] and 'nocase' or 'cmp' items = sequence.sort( items, ((key, sortFunc, sort_dir),) ) batch_obj = Batch(items, context.default_batch_size, b_start, orphan=0, quantumleap=1) items = [] -display_delete_button = True # TODO : à revoir +display_delete_button = not isAnon # TODO : à revoir for item in batch_obj: item_icon = item.getIcon item_id = item.getId item_url = item.getURL() - #try : item_delete_allowed = context.objectIdCanBeDeleted(item_id) - #except : item_delete_allowed = checkPermission(DeleteObjects, context) # std zope perm - #if not display_delete_button : - # display_delete_button = item_delete_allowed items.append( - {'lock' : False, - 'checkbox': True, + {'checkbox': not isAnon, 'icon': item_icon and ( '%s/%s' % (portal_url, item_icon) ) or '', 'id': item_id, 'modified': item.modified.strftime(locale_date_fmt), diff --git a/skins/photo_theme/folder_contents_macros.pt b/skins/photo_theme/folder_contents_macros.pt index 98177ba..2cb5b03 100644 --- a/skins/photo_theme/folder_contents_macros.pt +++ b/skins/photo_theme/folder_contents_macros.pt @@ -41,10 +41,6 @@ - lock