Merge "Makes Launch/ Edit buttons in Images explicit"

This commit is contained in:
Jenkins 2015-04-01 12:32:54 +00:00 committed by Gerrit Code Review
commit fc963b9647
2 changed files with 5 additions and 5 deletions

View File

@ -33,7 +33,7 @@ NOT_LAUNCHABLE_FORMATS = ['aki', 'ari']
class LaunchImage(tables.LinkAction):
name = "launch_image"
verbose_name = _("Launch")
verbose_name = _("Launch Instance")
url = "horizon:project:instances:launch"
classes = ("ajax-modal", "btn-launch")
icon = "cloud-upload"
@ -104,7 +104,7 @@ class CreateImage(tables.LinkAction):
class EditImage(tables.LinkAction):
name = "edit"
verbose_name = _("Edit")
verbose_name = _("Edit Image")
url = "horizon:project:images:images:update"
classes = ("ajax-modal",)
icon = "pencil"

View File

@ -99,16 +99,16 @@ class ImagesAndSnapshotsTests(test.TestCase):
# first instance - status active, owned
self.assertEqual(len(row_actions), 4)
self.assertEqual(row_actions[0].verbose_name, u"Launch")
self.assertEqual(row_actions[0].verbose_name, u"Launch Instance")
self.assertEqual(row_actions[1].verbose_name, u"Create Volume")
self.assertEqual(row_actions[2].verbose_name, u"Edit")
self.assertEqual(row_actions[2].verbose_name, u"Edit Image")
self.assertEqual(row_actions[3].verbose_name, u"Delete Image")
row_actions = snaps.get_row_actions(snaps.data[1])
# second instance - status active, not owned
self.assertEqual(len(row_actions), 2)
self.assertEqual(row_actions[0].verbose_name, u"Launch")
self.assertEqual(row_actions[0].verbose_name, u"Launch Instance")
self.assertEqual(row_actions[1].verbose_name, u"Create Volume")
row_actions = snaps.get_row_actions(snaps.data[2])