diff --git a/modoboa/admin/models/alias.py b/modoboa/admin/models/alias.py index 2d14bbda2..0c3223d18 100644 --- a/modoboa/admin/models/alias.py +++ b/modoboa/admin/models/alias.py @@ -187,7 +187,7 @@ class Alias(AdminObject): raise Conflict self.address = address self.domain = domain - self.enabled = (row[2].strip() in ["True", "1", "yes", "y"]) + self.enabled = (row[2].strip().lower() in ["true", "1", "yes", "y"]) self.save() self.set_recipients([raddress.strip() for raddress in row[3:]]) self.post_create(user) diff --git a/modoboa/admin/models/domain.py b/modoboa/admin/models/domain.py index e580fddae..16a59ab6d 100644 --- a/modoboa/admin/models/domain.py +++ b/modoboa/admin/models/domain.py @@ -269,7 +269,7 @@ class Domain(AdminObject): _("Default mailbox quota cannot be greater than domain " "quota") ) - self.enabled = (row[4].strip() in ["True", "1", "yes", "y"]) + self.enabled = (row[4].strip().lower() in ["true", "1", "yes", "y"]) core_signals.can_create_object.send( sender=self.__class__, context=user, klass=Domain, instance=self) diff --git a/modoboa/admin/models/domain_alias.py b/modoboa/admin/models/domain_alias.py index 92dbba536..516be06fc 100644 --- a/modoboa/admin/models/domain_alias.py +++ b/modoboa/admin/models/domain_alias.py @@ -80,7 +80,7 @@ class DomainAlias(AdminObject): raise BadRequest(_("Unknown domain %s") % domname) core_signals.can_create_object.send( sender="import", context=self.target, object_type="domain_aliases") - self.enabled = row[3].strip() in ["True", "1", "yes", "y"] + self.enabled = row[3].strip().lower() in ["true", "1", "yes", "y"] self.save(creator=user) def to_csv(self, csvwriter): diff --git a/modoboa/core/models.py b/modoboa/core/models.py index 648fc93a9..7d815c1c8 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -392,7 +392,7 @@ class User(PermissionsMixin): self.password = row[2].strip() self.first_name = row[3].strip() self.last_name = row[4].strip() - self.is_active = (row[5].strip() in ["True", "1", "yes", "y"]) + self.is_active = (row[5].strip().lower() in ["true", "1", "yes", "y"]) self.save() self.role = desired_role self.post_create(user) diff --git a/modoboa/relaydomains/models.py b/modoboa/relaydomains/models.py index 36f8eee5b..628e7cd54 100644 --- a/modoboa/relaydomains/models.py +++ b/modoboa/relaydomains/models.py @@ -122,14 +122,15 @@ class RelayDomain(admin_models.AdminObject): raise BadRequest(_("Invalid line")) self.domain = admin_models.Domain( name=row[1].strip(), type="relaydomain", quota=0, - enabled=(row[5].strip() in ["True", "1", "yes", "y"]) + enabled=(row[5].strip().lower() in ["true", "1", "yes", "y"]) ) self.domain.save(creator=user) self.target_host = row[2].strip() self.target_port = row[3].strip() self.service, created = Service.objects.get_or_create( name=row[4].strip()) - self.verify_recipients = (row[6].strip() in ["True", "1", "yes", "y"]) + self.verify_recipients = ( + row[6].strip().lower() in ["true", "1", "yes", "y"]) self.save(creator=user)