Better display for undefined/unlimited limits.

see #105

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")

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

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>