Corrects available actions for syspanel images table.

* Fixes bug 955630 by removing the launch instance action.
  * Allows admins to delete any image.

Change-Id: Ie9bd1c93349c19ac07b6d576115420da55148042
This commit is contained in:
Gabriel Hurley
2012-03-14 17:59:00 -07:00
parent 42c47150c9
commit b61ee08653
2 changed files with 18 additions and 3 deletions

View File

@@ -14,5 +14,20 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.utils.translation import ugettext as _
from horizon.dashboards.nova.images_and_snapshots.images.tables import (
ImagesTable, LaunchImage, EditImage, DeleteImage)
ImagesTable, EditImage, DeleteImage)
class AdminDeleteImage(DeleteImage):
def allowed(self, request, image=None):
return True
class AdminImagesTable(ImagesTable):
class Meta:
name = "images"
verbose_name = _("Images")
table_actions = (AdminDeleteImage,)
row_actions = (EditImage, AdminDeleteImage)

View File

@@ -26,14 +26,14 @@ from horizon import api
from horizon import exceptions
from horizon import tables
from horizon.dashboards.nova.images_and_snapshots.images import views
from .tables import ImagesTable
from .tables import AdminImagesTable
LOG = logging.getLogger(__name__)
class IndexView(tables.DataTableView):
table_class = ImagesTable
table_class = AdminImagesTable
template_name = 'syspanel/images/index.html'
def get_data(self):