Skip to content

Commit

Permalink
Corrects available actions for syspanel images table.
Browse files Browse the repository at this point in the history
  * Fixes bug 955630 by removing the launch instance action.
  * Allows admins to delete any image.

Change-Id: Ie9bd1c93349c19ac07b6d576115420da55148042
  • Loading branch information
gabrielhurley committed Mar 15, 2012
1 parent 42c4715 commit b61ee08
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
17 changes: 16 additions & 1 deletion horizon/dashboards/syspanel/images/tables.py
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions horizon/dashboards/syspanel/images/views.py
Expand Up @@ -26,14 +26,14 @@
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):
Expand Down

0 comments on commit b61ee08

Please sign in to comment.