openstack/horizon
Code Issues Proposed changes

Merge "Do not run preemptive actions twice"

Browse Source
This commit is contained in:
Jenkins 2013-09-05 10:54:18 +00:00 committed by Gerrit Code Review
commit f1f6f86dee
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
horizon/tables/base.py
View File

@ -1249,6 +1249,10 @@ class DataTable(object):
request = self.request request = self.request
table_name, action_name, obj_id = self.check_handler(request) table_name, action_name, obj_id = self.check_handler(request)
if table_name == self.name and action_name: if table_name == self.name and action_name:
action_names = [action.name for action in
self.base_actions.values() if not action.preempt]
# do not run preemptive actions here
if action_name in action_names:
return self.take_action(action_name, obj_id) return self.take_action(action_name, obj_id)
return None return None