aboutsummaryrefslogtreecommitdiffstats
path: root/servo/models
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2021-05-30 10:34:01 +0300
committerFilipp Lepalaan <filipp@mac.com>2021-05-30 10:34:01 +0300
commit9dcc51f2211385239b0272bdbf2466637c874f35 (patch)
tree8ac9104abcfa817dc1092e5f338b8c90b4b8aaff /servo/models
parent467f9fef717cbdc217aae63fef6481150e8e34a7 (diff)
downloadServo-9dcc51f2211385239b0272bdbf2466637c874f35.tar.gz
Servo-9dcc51f2211385239b0272bdbf2466637c874f35.tar.bz2
Servo-9dcc51f2211385239b0272bdbf2466637c874f35.zip
Check-in fixes and improvements
Diffstat (limited to 'servo/models')
-rw-r--r--servo/models/customer.py4
-rw-r--r--servo/models/device.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/servo/models/customer.py b/servo/models/customer.py
index 9d81371..bb34892 100644
--- a/servo/models/customer.py
+++ b/servo/models/customer.py
@@ -93,9 +93,9 @@ class Customer(MPTTModel):
country = models.CharField(
blank=True,
max_length=2,
+ choices=COUNTRY_CHOICES,
verbose_name=_('Country'),
- default=defaults.country,
- choices=COUNTRY_CHOICES
+ default=settings.INSTALL_COUNTRY.upper(),
)
photo = models.ImageField(
null=True,
diff --git a/servo/models/device.py b/servo/models/device.py
index d994d20..671dc3e 100644
--- a/servo/models/device.py
+++ b/servo/models/device.py
@@ -141,8 +141,8 @@ class Device(models.Model):
blank=True,
max_length=128,
choices=countries,
- default=defaults.country,
- verbose_name=_("Purchase Country")
+ verbose_name=_("Country Of Purchase"),
+ default=settings.INSTALL_COUNTRY.upper(),
)
sla_description = models.TextField(null=True, editable=False)