vmbuilder/console
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Ошибка с новыми пользователями

Browse source
This commit is contained in:
Vyacheslav Anzhiganov 2016-06-26 13:48:50 +03:00
parent b0330c36da
commit 02b9974a17
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SWSCloudCore/models.py
View file

@ -111,7 +111,7 @@ class UsersRecoveryCodes(PgSQLModel):
class UsersSecrets(PgSQLModel): class UsersSecrets(PgSQLModel):
user = ForeignKeyField(Users) user = ForeignKeyField(Users)
# 4f235008-a9bd-11e5-a24e-28d244e159e9 # 4f235008-a9bd-11e5-a24e-28d244e159e9
secret = CharField(unique=True, null=False) secret = CharField(unique=False, null=False)
# 1.1.1.1,1.2.3.4 # 1.1.1.1,1.2.3.4
acl = TextField() acl = TextField()
# 0 - inactive # 0 - inactive

7
SWSCloudWeb/views/account/__init__.py
View file

@ -155,6 +155,7 @@ def registration():
ControllerUsersDetails(user_id).details_create() ControllerUsersDetails(user_id).details_create()
ControllerBilling().create(user_id, g.settings['bonus']) ControllerBilling().create(user_id, g.settings['bonus'])
ControllerAPI().set(user_id=user_id, secret=user_id, acl='', status=0)
# ControllerU # ControllerU
# send mail message with recovery code # send mail message with recovery code
message = u""" message = u"""
@ -406,8 +407,8 @@ def api_index():
if not ControllerUsers().auth(session.get('email'), session.get('password')): if not ControllerUsers().auth(session.get('email'), session.get('password')):
return redirect(url_for("account.logout")) return redirect(url_for("account.logout"))
# #
if not ControllerAPI().check(session.get('user_id')): if not ControllerAPI().check(user_id=session.get('user_id')):
ControllerAPI().set(user_id=session.get('user_id'), secret='', acl='', status=0) ControllerAPI().set(user_id=session.get('user_id'), secret=session.get('user_id'), acl='', status=0)
# #
return render_template( return render_template(
'default/id/api.html', 'default/id/api.html',
@ -431,4 +432,4 @@ def api_update():
request.form['status'] request.form['status']
) )
# #
return redirect(url_for('account.api')) return redirect(url_for('account.api_index'))

2
setup.py
View file

@ -4,7 +4,7 @@ from setuptools import setup
setup( setup(
name='SWSCloudCore', name='SWSCloudCore',
version='2.5.14', version='2.5.15',
author='Vyacheslav Anzhiganov', author='Vyacheslav Anzhiganov',
author_email='hello@anzhiganov.com', author_email='hello@anzhiganov.com',
packages=[ packages=[