From be1a84a9de6bbdb7f4ee4cdebb0d42b12b692523 Mon Sep 17 00:00:00 2001 From: Erik Berkun-Drevnig Date: Mon, 15 Jun 2015 01:04:22 -0400 Subject: [PATCH 1/2] Fix incorrect label tag The value of the for attribute must match the id of the input tag --- modoboa/lib/form_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/lib/form_utils.py b/modoboa/lib/form_utils.py index 2d8469dc5..4c8748fea 100644 --- a/modoboa/lib/form_utils.py +++ b/modoboa/lib/form_utils.py @@ -404,7 +404,7 @@ class DomainNameField(CharField): class CustomRadioInput(RadioInput): def __unicode__(self): if 'id' in self.attrs: - label_for = ' for="%s_%s"' % (self.attrs['id'], self.index) + label_for = ' for="%s"' % self.attrs['id'] else: label_for = '' choice_label = conditional_escape(force_unicode(self.choice_label)) From f7b0ee3c42608dcd06f5bb0a0872426add52ad64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ste=CC=81phane=20Klein?= Date: Tue, 23 Jun 2015 10:34:01 +0200 Subject: [PATCH 2/2] Fix check new versions bug if modoboa is offline --- modoboa/core/extensions.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modoboa/core/extensions.py b/modoboa/core/extensions.py index 6b84ce3dc..3abf569a6 100644 --- a/modoboa/core/extensions.py +++ b/modoboa/core/extensions.py @@ -118,13 +118,16 @@ class ExtensionsPool(object): def list_all(self, check_new_versions=False): """List all defined extensions.""" result = [] + new_extensions = {} if check_new_versions: new_extensions = ModoAPIClient().list_extensions() - new_extensions = dict( - (ext["name"], ext["version"]) for ext in new_extensions - ) - else: - new_extensions = {} + if new_extensions: + new_extensions = dict( + (ext["name"], ext["version"]) for ext in new_extensions + ) + else: + new_extensions = {} + for extname, extdef in self.extensions.iteritems(): if not extdef["show"]: continue