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

Merge pull request #337 from FirmlyReality/login_info 

further update
This commit is contained in:
Yujian Zhu 2018-09-20 00:24:49 +08:00 committed by GitHub
parent b07eb75a62 f5e960a80a
commit 69059c3fff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/model.py
View File

@ -98,7 +98,7 @@ class User(db.Model):
self.department = department self.department = department
self.truename = truename self.truename = truename
self.tel = tel self.tel = tel
self.beans = 1000 self.beans = 150
if (date != None): if (date != None):
self.register_date = date self.register_date = date
else: else:

2
user/user.py
View File

@ -521,7 +521,7 @@ def beans_apply(cur_user,user,form,issue):
if issue == 'apply': if issue == 'apply':
if not cur_user.status == 'normal': if not cur_user.status == 'normal':
return json.dumps({'success':'false', 'message':'Fail to apply for beans because your account is locked/not activated. Please:'+ return json.dumps({'success':'false', 'message':'Fail to apply for beans because your account is locked/not activated. Please:'+
'<br/> 1. Complete your information and activate your account. <br/> Or: <br/> 2.Contact administor for further information'}) '\n 1. Complete your information and activate your account. \n Or: \n 2.Contact administor for further information'})
number = form.get("number",None) number = form.get("number",None)
reason = form.get("reason",None) reason = form.get("reason",None)
if number is None or reason is None: if number is None or reason is None: