From 0a4880ab458167fc14838277ec36163d4ecd7494 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 11 Apr 2012 15:17:12 +0200
Subject: [PATCH] Better display for undefined/unlimited limits.

see #105
---
 extensions/limits/__init__.py                     | 4 +++-
 extensions/limits/models.py                       | 7 +++++++
 extensions/limits/templates/limits/poolusage.html | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/extensions/limits/__init__.py b/extensions/limits/__init__.py
index 9d82c46e7..7f0a203d3 100644
--- a/extensions/limits/__init__.py
+++ b/extensions/limits/__init__.py
@@ -74,7 +74,9 @@ def display_pool_usage(user, target, currentpage):
             names += ["domain_admins_limit"]
     else:
         names = ["domains_limit", "domain_aliases_limit"]
-    limits = user.limitspool.limit_set.filter(name__in=names)
+    limits = user.limitspool.limit_set.filter(name__in=names, maxvalue__gt=0)
+    if len(limits) == 0:
+        return []
     return [render_to_string("limits/poolusage.html", dict(limits=limits))]
 
 @events.observe("ExtraAccountForm")
diff --git a/extensions/limits/models.py b/extensions/limits/models.py
index 47c814ac9..dc1490ef9 100644
--- a/extensions/limits/models.py
+++ b/extensions/limits/models.py
@@ -94,3 +94,10 @@ class Limit(models.Model):
             if l[0] == self.name:
                 return l[1]
         return ""
+
+    def __str__(self):
+        if self.maxvalue == -2:
+            return _("undefined")
+        if self.maxvalue == -1:
+            return _("unlimited")
+        return "%d%%" % self.usage
diff --git a/extensions/limits/templates/limits/poolusage.html b/extensions/limits/templates/limits/poolusage.html
index 1ce693d75..f2f1eadf6 100644
--- a/extensions/limits/templates/limits/poolusage.html
+++ b/extensions/limits/templates/limits/poolusage.html
@@ -2,7 +2,7 @@
 <div class="well">
   <h6>{% trans "Resource usage" %}</h6>{% for l in limits %}
   <div class="resource">
-    {{ l.label }} ({{ l.usage }}%)
-    <div rel="tooltip" title="{{ l.curvalue }}/{{ l.maxvalue }}" class="progress {% progress_color l.usage %}"><div class="bar" style="width: {{ l.usage }}%"></div></div>
+    {{ l.label }} ({{ l }})
+    <div rel="tooltip" title="{{ l.curvalue }}/{{ l.maxvalue }}" class="progress {% progress_color l.usage %}"><div class="bar" style="width: {{ l }}"></div></div>
   </div>
 {% endfor %}</div>