JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from takeshixx/dev 

Fixed permanent "referenced before assignment" condition
selenium-screenshot-testing
Kevin Chung 2015-01-01 20:47:58 -05:00
parent 0c379e7444 65891ed215
commit 6705f97194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CTFd/views.py
View File

@ -118,10 +118,6 @@ def init_views(app):
name = request.form.get('name') name = request.form.get('name')
email = request.form.get('email') email = request.form.get('email')
if 'password' in request.form.keys() and not len(request.form['password']) == 0:
password = request.form.get('password')
website = request.form.get('website') website = request.form.get('website')
affiliation = request.form.get('affiliation') affiliation = request.form.get('affiliation')
country = request.form.get('country') country = request.form.get('country')
@ -149,7 +145,8 @@ def init_views(app):
team = Teams.query.filter_by(id=session['id']).first() team = Teams.query.filter_by(id=session['id']).first()
team.name = name team.name = name
team.email = email team.email = email
team.password = bcrypt_sha256.encrypt(password) if 'password' in request.form.keys() and not len(request.form['password']) == 0:
team.password = bcrypt_sha256.encrypt(request.form.get('password'))
team.website = website team.website = website
team.affiliation = affiliation team.affiliation = affiliation
team.country = country team.country = country