← Back to branch summary

~ubuntu-branches/ubuntu/saucy/horizon/saucy-updates

« back to all changes in this revision

Viewing changes to openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/tables.py

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Chuck Short
  • Date: 2013-10-03 13:48:12 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20131003134812-2vkwosem4flwuk5y
Tags: 1:2013.2~rc1-0ubuntu1
https://launchpad.net/bugs/1226674
[ James Page ]
* New upstream release candidate:
  - d/static: Refreshed static assets for 2013.2~rc1.
  - d/patches: Refreshed patches.

[ Chuck Short ]
* debian/control: Add python-lesscpy as a suggests to optionally
  support online compression of static assets (LP: #1226674).

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/tables.py
14
14
#    License for the specific language governing permissions and limitations
15
15
#    under the License.
16
16
 
17
 
import logging
18
 
 
19
17
from django.core.urlresolvers import reverse  # noqa
20
18
from django.utils.http import urlencode  # noqa
21
19
from django.utils import safestring
30
28
    import tables as volume_tables
31
29
 
32
30
 
33
 
LOG = logging.getLogger(__name__)
34
 
 
35
 
 
36
31
class DeleteVolumeSnapshot(tables.DeleteAction):
37
32
    data_type_singular = _("Volume Snapshot")
38
33
    data_type_plural = _("Volume Snapshots")
62
57
 
63
58
    def get_data(self, request, snapshot_id):
64
59
        snapshot = cinder.volume_snapshot_get(request, snapshot_id)
 
60
        snapshot._volume = cinder.volume_get(request, snapshot.volume_id)
65
61
        return snapshot
66
62
 
67
63
 
68
64
class SnapshotVolumeNameColumn(tables.Column):
69
65
    def get_raw_data(self, snapshot):
70
 
        request = self.table.request
71
 
        volume_name = api.cinder.volume_get(request,
72
 
                                            snapshot.volume_id).display_name
 
66
        volume = snapshot._volume
 
67
        if volume:
 
68
            volume_name = volume.display_name or volume.id
 
69
        else:
 
70
            volume_name = _("Unknown")
73
71
        return safestring.mark_safe(volume_name)
74
72
 
75
73
    def get_link_url(self, snapshot):
76
 
        volume_id = api.cinder.volume_get(self.table.request,
77
 
                                          snapshot.volume_id).id
78
 
        return reverse(self.link, args=(volume_id,))
 
74
        volume = snapshot._volume
 
75
        if volume:
 
76
            volume_id = volume.id
 
77
            return reverse(self.link, args=(volume_id,))
79
78
 
80
79
 
81
80
class VolumeSnapshotsTable(volume_tables.VolumesTableBase):