m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hot fix of external login of web

This commit is contained in:
leebaok 2016-04-01 16:56:05 +08:00
parent 7895d7a60f
commit 1936fb6ce4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/templates/login.html
View File

@ -54,7 +54,7 @@
Facebook</a> Facebook</a>
<a href="#" class="btn btn-block btn-social btn-google btn-flat"><i class="fa fa-google-plus"></i> Sign in using <a href="#" class="btn btn-block btn-social btn-google btn-flat"><i class="fa fa-google-plus"></i> Sign in using
Google+</a--> Google+</a-->
{{ link }} <a href="{{ url }}">{{ link }}</a>
</div> </div>
</div> </div>

4
web/webViews/authenticate/login.py
View File

@ -40,10 +40,12 @@ class loginView(normalView):
#refreshInfo() #refreshInfo()
return redirect(request.args.get('next',None) or '/dashboard/') return redirect(request.args.get('next',None) or '/dashboard/')
if (env.getenv('EXTERNAL_LOGIN') == 'True'): if (env.getenv('EXTERNAL_LOGIN') == 'True'):
url = external_generate.external_login_url
link = external_generate.external_login_link link = external_generate.external_login_link
else: else:
link = '' link = ''
return render_template(self.template_path, link = link) url = ''
return render_template(self.template_path, link = link, url = url)
@classmethod @classmethod
def post(self): def post(self):