← Back to branch summary

~ubuntu-branches/ubuntu/vivid/horizon/vivid-proposed

« back to all changes in this revision

Viewing changes to openstack_dashboard/usage/tables.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Chuck Short, Corey Bryant, James Page
  • Date: 2015-01-05 16:42:06 UTC
  • mfrom: (0.9.1) (1.2.5)
  • Revision ID: package-import@ubuntu.com-20150105164206-zrt2q64h4weugkur
Tags: 1:2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open for Kilo.
* d/control: Update bzr branches 
* d/patches/embedded-xstatic.patch: Refreshed
* d/patches/add-juju-environment-download.patch: Temporarily disabled.

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
* d/control: Bumped Standards-Version to 3.9.6.

[ James Page ]
* d/bundle-xstatic.sh: Tweak grep to be case insensitive.
* d/p/add-juju-environment-download.patch: Rebase for kilo-1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/usage/tables.py
53
53
    project = tables.Column('project_name', verbose_name=_("Project Name"))
54
54
    disk_hours = tables.Column('disk_gb_hours',
55
55
                               verbose_name=_("Disk GB Hours"),
 
56
                               help_text=_("Total disk usage (GB * "
 
57
                                           "Hours Used) for the project"),
56
58
                               filters=(lambda v: floatformat(v, 2),))
57
59
 
58
60
    def get_object_id(self, datum):
60
62
 
61
63
    class Meta:
62
64
        name = "global_usage"
 
65
        hidden_title = False
63
66
        verbose_name = _("Usage")
64
67
        columns = ("project", "vcpus", "disk", "memory",
65
68
                   "hours", "disk_hours")
89
92
 
90
93
    class Meta:
91
94
        name = "project_usage"
 
95
        hidden_title = False
92
96
        verbose_name = _("Usage")
93
97
        columns = ("instance", "vcpus", "disk", "memory", "uptime")
94
98
        table_actions = (CSVSummary, DownloadJujuEnv,)