aboutsummaryrefslogtreecommitdiffstats
path: root/servo/models
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2015-08-14 15:21:30 +0300
committerFilipp Lepalaan <filipp@mac.com>2015-08-14 15:21:30 +0300
commit47564afcc25b48d42c76613899b96b9826b3cfc4 (patch)
tree897c29bd595fef7f0f09a9b5d45c961d779b56d5 /servo/models
parent1ac299bd93f66e5597c23b6bc103e519feffbec1 (diff)
downloadServo-47564afcc25b48d42c76613899b96b9826b3cfc4.tar.gz
Servo-47564afcc25b48d42c76613899b96b9826b3cfc4.tar.bz2
Servo-47564afcc25b48d42c76613899b96b9826b3cfc4.zip
Remove GSX password fields
Diffstat (limited to 'servo/models')
-rw-r--r--servo/models/account.py7
-rw-r--r--servo/models/common.py18
2 files changed, 4 insertions, 21 deletions
diff --git a/servo/models/account.py b/servo/models/account.py
index 883a877..a51a340 100644
--- a/servo/models/account.py
+++ b/servo/models/account.py
@@ -153,12 +153,7 @@ class User(AbstractUser):
max_length=128,
verbose_name=_("User ID")
)
- gsx_password = models.CharField(
- blank=True,
- default='',
- max_length=256,
- verbose_name=_("Password")
- )
+
gsx_poprefix = models.CharField(
blank=True,
default='',
diff --git a/servo/models/common.py b/servo/models/common.py
index 58b7427..3c06d84 100644
--- a/servo/models/common.py
+++ b/servo/models/common.py
@@ -220,13 +220,6 @@ class GsxAccount(models.Model):
verbose_name=_("User ID")
)
- password = models.CharField(
- blank=True,
- default='',
- max_length=256,
- verbose_name=_("Password")
- )
-
environment = models.CharField(
max_length=2,
verbose_name=_("Environment"),
@@ -289,8 +282,6 @@ class GsxAccount(models.Model):
"""
if user.gsx_userid:
self.user_id = user.gsx_userid
- if user.gsx_password:
- self.password = user.gsx_password
if location is None:
timezone = user.location.gsx_tz
@@ -298,7 +289,6 @@ class GsxAccount(models.Model):
timezone = location.gsx_tz
gsxws.connect(user_id=self.user_id,
- password=self.password,
sold_to=self.sold_to,
environment=self.environment,
timezone=timezone)
@@ -308,11 +298,9 @@ class GsxAccount(models.Model):
"""
Tests that the account details are correct
"""
- if self.user_id and self.password:
- gsxws.connect(sold_to=self.sold_to,
- user_id=self.user_id,
- password=self.password,
- environment=self.environment)
+ gsxws.connect(sold_to=self.sold_to,
+ user_id=self.user_id,
+ environment=self.environment)
def get_admin_url(self):
return reverse('admin-edit_gsx_account', args=[self.pk])