walle 2.0 alpha - fix空间更新用户owner、pip组件安全版本升级

.gitignore

@@ -46,6 +46,7 @@ flask
 nosetests.xml
 coverage.xml
 venv
+venv3
 
 ############################# 保留文件 #############################
 !requirements.txt

requirements/prod.txt

@@ -19,7 +19,7 @@ Flask-SQLAlchemy==2.3.2
 psycopg2==2.7.1
 SQLAlchemy==1.2.14
 mysqlclient==1.3.13
-marshmallow==2.13.5
+marshmallow==2.15.1
 
 # Migrations
 Flask-Migrate==2.3.1
@@ -39,5 +39,5 @@ anyjson==0.3.3
 celery==3.1.18
 pycrypto==2.6.1
 pytz==2015.6
-requests==2.7.0
+requests==2.20.0
 GitPython==2.1.11

walle/api/general.py

@@ -58,6 +58,7 @@ class GeneralAPI(SecurityResource):
             'current': '',
             'available': '',
         }
+        UserModel.fresh_session()
         # TODO
         # 超管不需要展示空间列表
         if current_user.role != SUPER:

walle/api/space.py

@@ -129,8 +129,11 @@ class SpaceAPI(SecurityResource):
             # a new type to update a model
             ret = space.update(data)
             # create group
+            member = {"user_id": data['user_id'], "role": OWNER}
             if 'members' in request.form:
-                MemberModel(group_id=space_id).update_group(members=json.loads(request.form['members']))
+                members = json.loads(request.form['members'])
+                members.append(member)
+            MemberModel(group_id=space_id).update_group(members=members)
             return self.render_json(data=space.item())
         else:
             return self.render_error(code=Code.form_error, message=form.errors)