From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 10 Dec 2012 08:56:11 +0000 (+0000)
Subject: Added upstream patch for quota summary.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1443ab5397be41963591aee2df44c7915b7765ec;p=openstack-build%2Fhorizon-build.git

Added upstream patch for quota summary.

Rewritten-From: 4fa8c913c3ce8461111c76becc20483b34830616
---

diff --git a/xenial/debian/patches/fix-quota-summary.patch b/xenial/debian/patches/fix-quota-summary.patch
new file mode 100644
index 0000000..eaf3c9a
--- /dev/null
+++ b/xenial/debian/patches/fix-quota-summary.patch
@@ -0,0 +1,26 @@
+Description: Fixes: Can not display usage data for Quota Summary.
+Author: Kylin CG <kylin7.sg@gmail.com>
+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 @@
+ 
+ <div class="quota-dynamic">
+   <h3>{% trans "Quota Summary" %}</h3>
+-    <strong>{% trans "Used" %}<span> {{ usage.quota.instances.used|intcomma }} </span> {% trans "of" %} <span> {{ usage.quota.instances.quota|intcomma }} </span>{% trans "Available Instances" %} </strong>
+-    {% horizon_progress_bar usage.quota.instances.used usage.quota.instances.quota %}
++    <strong>{% trans "Used" %}<span> {{ usage.quotas.instances.used|intcomma }} </span> {% trans "of" %} <span> {{ usage.quotas.instances.quota|intcomma }} </span>{% trans "Available Instances" %} </strong>
++    {% horizon_progress_bar usage.quotas.instances.used usage.quotas.instances.quota %}
+ 
+-    <strong>{% trans "Used" %} <span> {{ usage.quota.cores.used|intcomma }} </span>{% trans "of" %}<span> {{ usage.quota.cores.quota|intcomma }} </span>{% trans "Available vCPUs" %} </strong>
+-    {% horizon_progress_bar usage.quota.cores.used usage.quota.cores.quota %}
++    <strong>{% trans "Used" %} <span> {{ usage.quotas.cores.used|intcomma }} </span>{% trans "of" %}<span> {{ usage.quotas.cores.quota|intcomma }} </span>{% trans "Available vCPUs" %} </strong>
++    {% horizon_progress_bar usage.quotas.cores.used usage.quotas.cores.quota %}
+ 
+-    <strong>{% trans "Used" %} <span> {{ usage.quota.ram.used|intcomma }} MB </span>{% trans "of" %}<span> {{ usage.quota.ram.quota|intcomma }} MB </span>{% trans "Available RAM" %} </strong>
+-    {% horizon_progress_bar usage.quota.ram.used usage.quota.ram.quota %}
++    <strong>{% trans "Used" %} <span> {{ usage.quotas.ram.used|intcomma }} MB </span>{% trans "of" %}<span> {{ usage.quotas.ram.quota|intcomma }} MB </span>{% trans "Available RAM" %} </strong>
++    {% horizon_progress_bar usage.quotas.ram.used usage.quotas.ram.quota %}
+ </div>
diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 64c0a5e..773c63b 100644
--- a/xenial/debian/patches/series
+++ b/xenial/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