From 75663c308bde746ef5c07bbcb36e75843c4fa781 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Thu, 13 May 2010 10:53:15 +0100 Subject: [PATCH] Fixed a few instances where api settings would go not setup --- sso/cron.py | 4 +++- sso/views.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sso/cron.py b/sso/cron.py index 0e47382..3e4886d 100644 --- a/sso/cron.py +++ b/sso/cron.py @@ -42,5 +42,7 @@ class ValidateDisabledUsers(): def job(self): for servacc in ServiceAccount.objects.filter(active=0): self._logger.info('Checking %s' % servacc) - if not servacc.service.api_class.disable_user(servacc.service_uid): + api = servacc.service.api_class + api.settings = servacc.service.settings + if not api.disable_user(servacc.service_uid): self._logger.error('Error disabling %s on %s' % (servacc, servacc.service)) diff --git a/sso/views.py b/sso/views.py index 13cf89b..1de1ea9 100644 --- a/sso/views.py +++ b/sso/views.py @@ -212,6 +212,7 @@ def service_reset(request, serviceid=0): passwd = form.cleaned_data['password'] api = acc.service.api_class + api.settings = acc.service.settings if not api.reset_password(acc.service_uid, passwd): error = True return render_to_response('sso/serviceaccount/resetcomplete.html', locals(), context_instance=RequestContext(request))