From a5082023b5019cff72e51c6286f232d57120b5b6 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 10 Dec 2012 08:56:11 +0000 Subject: [PATCH] Added upstream patch for quota summary. Rewritten-From: 4fa8c913c3ce8461111c76becc20483b34830616 --- trusty/debian/patches/fix-quota-summary.patch | 26 +++++++++++++++++++ trusty/debian/patches/series | 1 + 2 files changed, 27 insertions(+) create mode 100644 trusty/debian/patches/fix-quota-summary.patch diff --git a/trusty/debian/patches/fix-quota-summary.patch b/trusty/debian/patches/fix-quota-summary.patch new file mode 100644 index 0000000..eaf3c9a --- /dev/null +++ b/trusty/debian/patches/fix-quota-summary.patch @@ -0,0 +1,26 @@ +Description: Fixes: Can not display usage data for Quota Summary. +Author: Kylin CG +Origin: upstream, https://review.openstack.org/#/c/17030/ +Bug-Ubuntu: https://launchpad.net/bugs/1055929 + +--- horizon-2012.2.1.orig/horizon/templates/horizon/common/_quota_summary.html ++++ horizon-2012.2.1/horizon/templates/horizon/common/_quota_summary.html +@@ -2,12 +2,12 @@ + +
+

{% trans "Quota Summary" %}

+- {% trans "Used" %} {{ usage.quota.instances.used|intcomma }} {% trans "of" %} {{ usage.quota.instances.quota|intcomma }} {% trans "Available Instances" %} +- {% horizon_progress_bar usage.quota.instances.used usage.quota.instances.quota %} ++ {% trans "Used" %} {{ usage.quotas.instances.used|intcomma }} {% trans "of" %} {{ usage.quotas.instances.quota|intcomma }} {% trans "Available Instances" %} ++ {% horizon_progress_bar usage.quotas.instances.used usage.quotas.instances.quota %} + +- {% trans "Used" %} {{ usage.quota.cores.used|intcomma }} {% trans "of" %} {{ usage.quota.cores.quota|intcomma }} {% trans "Available vCPUs" %} +- {% horizon_progress_bar usage.quota.cores.used usage.quota.cores.quota %} ++ {% trans "Used" %} {{ usage.quotas.cores.used|intcomma }} {% trans "of" %} {{ usage.quotas.cores.quota|intcomma }} {% trans "Available vCPUs" %} ++ {% horizon_progress_bar usage.quotas.cores.used usage.quotas.cores.quota %} + +- {% trans "Used" %} {{ usage.quota.ram.used|intcomma }} MB {% trans "of" %} {{ usage.quota.ram.quota|intcomma }} MB {% trans "Available RAM" %} +- {% horizon_progress_bar usage.quota.ram.used usage.quota.ram.quota %} ++ {% trans "Used" %} {{ usage.quotas.ram.used|intcomma }} MB {% trans "of" %} {{ usage.quotas.ram.quota|intcomma }} MB {% trans "Available RAM" %} ++ {% horizon_progress_bar usage.quotas.ram.used usage.quotas.ram.quota %} +
diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index 64c0a5e..773c63b 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -2,3 +2,4 @@ fix-dashboard-django-wsgi.patch fix-dashboard-manage.patch fix-ubuntu-tests.patch debian_local_settings.patch +fix-quota-summary.patch -- 2.45.2