Commit d3a7a732 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

follow naming convensions and cosmetic changes.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17974 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 77e35f0a
...@@ -70,7 +70,7 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ): ...@@ -70,7 +70,7 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ):
, 'action' : 'manage_overview' , 'action' : 'manage_overview'
}, },
{ 'label' : 'View Selections' { 'label' : 'View Selections'
, 'action' : 'manage_view_selections' , 'action' : 'manage_viewSelections'
}, },
{ 'label' : 'Configure' { 'label' : 'Configure'
, 'action' : 'manage_configure' , 'action' : 'manage_configure'
...@@ -81,8 +81,8 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ): ...@@ -81,8 +81,8 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ):
manage_overview = DTMLFile( 'explainSelectionTool', _dtmldir ) manage_overview = DTMLFile( 'explainSelectionTool', _dtmldir )
security.declareProtected( ERP5Permissions.ManagePortal security.declareProtected( ERP5Permissions.ManagePortal
, 'manage_view_selections' ) , 'manage_viewSelections' )
manage_view_selections = DTMLFile( 'SelectionTool_manageViewSelections', _dtmldir ) manage_viewSelections = DTMLFile( 'SelectionTool_manageViewSelections', _dtmldir )
security.declareProtected( ERP5Permissions.ManagePortal security.declareProtected( ERP5Permissions.ManagePortal
, 'manage_configure' ) , 'manage_configure' )
...@@ -163,7 +163,7 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ): ...@@ -163,7 +163,7 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ):
""" """
if self.isMemcachedUsed(): if self.isMemcachedUsed():
return [] return []
return self._getSelectionNameListFromContainer() return sorted(self._getSelectionNameListFromContainer())
# backward compatibility # backward compatibility
security.declareProtected(ERP5Permissions.View, 'getSelectionNames') security.declareProtected(ERP5Permissions.View, 'getSelectionNames')
...@@ -202,7 +202,7 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ): ...@@ -202,7 +202,7 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ):
""" """
if selection_object != None: if selection_object != None:
# Set the name so that this selection itself can get its own name. # Set the name so that this selection itself can get its own name.
selection_object.edit(name = selection_name) selection_object.edit(name=selection_name)
if self.getSelectionFor(selection_name) != selection_object: if self.getSelectionFor(selection_name) != selection_object:
self._setSelectionToContainer(selection_name, selection_object) self._setSelectionToContainer(selection_name, selection_object)
...@@ -294,7 +294,6 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ): ...@@ -294,7 +294,6 @@ class SelectionTool( BaseTool, UniqueObject, SimpleItem ):
""" """
selection_object = self.getSelectionFor(selection_name, REQUEST) selection_object = self.getSelectionFor(selection_name, REQUEST)
if selection_object: if selection_object:
#return selection_object.selection_checked_uids
return selection_object.getCheckedUids() return selection_object.getCheckedUids()
return [] return []
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment