fix problem created by refactor
parent
02103a8a29
commit
79ea81a5e1
|
@ -39,7 +39,7 @@ class ip:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
class authenticator():
|
class authenticator():
|
||||||
def process(authenticator, success_url, deny_url):
|
def process(self, caller, success_url, deny_url):
|
||||||
return HttpResponseRedirect(deny_url)
|
return HttpResponseRedirect(deny_url)
|
||||||
|
|
||||||
form = None
|
form = None
|
||||||
|
@ -54,17 +54,17 @@ class cardnum:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
class authenticator():
|
class authenticator():
|
||||||
def process(self, authenticator, success_url, deny_url):
|
def process(self, caller, success_url, deny_url):
|
||||||
if authenticator.form and authenticator.request.method=='POST' and authenticator.form.is_valid():
|
if caller.form and caller.request.method=='POST' and caller.form.is_valid():
|
||||||
library = authenticator.form.cleaned_data['library']
|
library = caller.form.cleaned_data['library']
|
||||||
library.credential = authenticator.form.cleaned_data['credential']
|
library.credential = caller.form.cleaned_data['credential']
|
||||||
logger.info('%s authenticated for %s from %s'%(authenticator.request.user, authenticator.library, authenticator.form.cleaned_data.get('number')))
|
logger.info('%s authenticated for %s from %s'%(caller.request.user, caller.library, caller.form.cleaned_data.get('number')))
|
||||||
library.add_user(authenticator.form.cleaned_data['user'])
|
library.add_user(caller.form.cleaned_data['user'])
|
||||||
return HttpResponseRedirect(success_url)
|
return HttpResponseRedirect(success_url)
|
||||||
else:
|
else:
|
||||||
return render(authenticator.request, 'libraryauth/library.html', {
|
return render(caller.request, 'libraryauth/library.html', {
|
||||||
'library':authenticator.library,
|
'library':caller.library,
|
||||||
'authenticator':authenticator,
|
'authenticator':caller,
|
||||||
})
|
})
|
||||||
|
|
||||||
class admin_form(forms.ModelForm):
|
class admin_form(forms.ModelForm):
|
||||||
|
@ -113,7 +113,7 @@ class email:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
class authenticator():
|
class authenticator():
|
||||||
def process(authenticator, success_url, deny_url):
|
def process(self, caller, success_url, deny_url):
|
||||||
return HttpResponseRedirect(deny_url)
|
return HttpResponseRedirect(deny_url)
|
||||||
form = None
|
form = None
|
||||||
class admin_form(forms.ModelForm):
|
class admin_form(forms.ModelForm):
|
||||||
|
|
|
@ -67,7 +67,7 @@ class Authenticator:
|
||||||
self.backend_class=getattr(backends,self.library.backend)
|
self.backend_class=getattr(backends,self.library.backend)
|
||||||
form_class = self.backend_class.form
|
form_class = self.backend_class.form
|
||||||
if form_class:
|
if form_class:
|
||||||
self.form = form_class(request, library, *args, **kwargs)
|
self.form = form_class(request, self.library, *args, **kwargs)
|
||||||
else:
|
else:
|
||||||
self.form = None
|
self.form = None
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ class Authenticator:
|
||||||
return superlogin(self.request, extra_context={'library':self.library}, template_name='libraryauth/library_login.html')
|
return superlogin(self.request, extra_context={'library':self.library}, template_name='libraryauth/library_login.html')
|
||||||
|
|
||||||
else:
|
else:
|
||||||
return self.backend_class.authenticator().process(success_url, deny_url)
|
return self.backend_class.authenticator().process(self, success_url, deny_url)
|
||||||
|
|
||||||
def allowed(self):
|
def allowed(self):
|
||||||
return self.backend_class.authenticate(self.request, self.library)
|
return self.backend_class.authenticate(self.request, self.library)
|
||||||
|
|
Loading…
Reference in New Issue