x/tuskar-ui
Code Issues Proposed changes

Makes sure ajax-updated rows still get correct actions allowed.

Browse Source 
Also moved some logic that pertained to BatchAction from
BaseAction to BatchAction where it belonged.

Fixes bug 944853.

Change-Id: I24f590f0b4320a0cc58d954398673a8fa75a49b6
This commit is contained in:
Gabriel Hurley 2012-03-06 19:34:20 -08:00
parent 8ff0f46b46
commit 07adf638eb
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
horizon/tables/actions.py
View File

@ -53,9 +53,6 @@ class BaseAction(html.HTMLElement):
return True
def _allowed(self, request, datum):
""" Default allowed checks for certain actions """
if isinstance(self, BatchAction) and not self.table.data:
return False
return self.allowed(request, datum)
def update(self, request, datum):
@ -427,6 +424,13 @@ class BatchAction(Action):
self._conjugate('plural'))
super(BatchAction, self).__init__()
def _allowed(self, request, datum=None):
# Override the default internal action method to prevent batch
# actions from appearing on tables with no data.
if not self.table.data and not datum:
return False
return super(BatchAction, self)._allowed(request, datum)
def _conjugate(self, items=None, past=False):
"""
Builds combinations like 'Delete Object' and 'Deleted