Merge "Fixed name of snaphot button."

This commit is contained in:
Jenkins 2012-08-02 19:09:52 +00:00 committed by Gerrit Code Review
commit 7626beecbf
2 changed files with 5 additions and 5 deletions

View File

@ -157,9 +157,9 @@ class EditInstance(tables.LinkAction):
classes = ("ajax-modal", "btn-edit") classes = ("ajax-modal", "btn-edit")
class SnapshotLink(tables.LinkAction): class CreateSnapshot(tables.LinkAction):
name = "snapshot" name = "snapshot"
verbose_name = _("Snapshot") verbose_name = _("Create Snapshot")
url = "horizon:nova:images_and_snapshots:snapshots:create" url = "horizon:nova:images_and_snapshots:snapshots:create"
classes = ("ajax-modal", "btn-camera") classes = ("ajax-modal", "btn-camera")
@ -293,6 +293,6 @@ class InstancesTable(tables.DataTable):
status_columns = ["status", "task"] status_columns = ["status", "task"]
row_class = UpdateRow row_class = UpdateRow
table_actions = (LaunchLink, TerminateInstance) table_actions = (LaunchLink, TerminateInstance)
row_actions = (SnapshotLink, AssociateIP, EditInstance, ConsoleLink, row_actions = (CreateSnapshot, AssociateIP, EditInstance, ConsoleLink,
LogLink, TogglePause, ToggleSuspend, RebootInstance, LogLink, TogglePause, ToggleSuspend, RebootInstance,
TerminateInstance) TerminateInstance)

View File

@ -23,7 +23,7 @@ from django.utils.translation import ugettext_lazy as _
from horizon import api from horizon import api
from horizon import tables from horizon import tables
from horizon.dashboards.nova.instances.tables import (TerminateInstance, from horizon.dashboards.nova.instances.tables import (TerminateInstance,
EditInstance, ConsoleLink, LogLink, SnapshotLink, EditInstance, ConsoleLink, LogLink, CreateSnapshot,
TogglePause, ToggleSuspend, RebootInstance, get_size, UpdateRow, TogglePause, ToggleSuspend, RebootInstance, get_size, UpdateRow,
LaunchLink, get_ips, get_power_state) LaunchLink, get_ips, get_power_state)
from horizon.utils.filters import replace_underscores from horizon.utils.filters import replace_underscores
@ -97,6 +97,6 @@ class SyspanelInstancesTable(tables.DataTable):
status_columns = ["status", "task"] status_columns = ["status", "task"]
table_actions = (AdminLaunchLink, TerminateInstance,) table_actions = (AdminLaunchLink, TerminateInstance,)
row_class = AdminUpdateRow row_class = AdminUpdateRow
row_actions = (EditInstance, ConsoleLink, LogLink, SnapshotLink, row_actions = (EditInstance, ConsoleLink, LogLink, CreateSnapshot,
TogglePause, ToggleSuspend, RebootInstance, TogglePause, ToggleSuspend, RebootInstance,
TerminateInstance) TerminateInstance)