Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI

This commit is contained in:
Matan Bar Yosef 2015-06-29 21:34:10 +03:00
commit bc2c8aa1f0

View file

@ -75,7 +75,7 @@ def create_project(token):
try:
project = Project(projectName=payload['projectName'], courseId=payload['courseId'], master_id=user.key().id(), gitRepository=payload['gitRepository'], membersId=[token])
project = Project(projectName=payload['projectName'], courseId=payload['courseId'], master_id=user.key().id(), gitRepository=payload['gitRepository'], membersId=[str(user.key().id())])
except Exception as e:
print e
return bad_request()
@ -86,8 +86,8 @@ def create_project(token):
print e
pass
project.info = json.dumps(get_github_data(project.gitRepository))
db.put(project)
project.info = json.dumps(get_github_data(project.gitRepository, project.key().id()))
#update user projects list
user.projects_id_list.append(str(project.key().id()))
@ -395,7 +395,7 @@ def updateProjectsInfo():
try:
projects = Project.all()
for project in projects.run():
project.info = json.dumps(get_github_data(project.gitRepository))
project.info = json.dumps(get_github_data(project.gitRepository, project.key().id()))
db.put(project)
db.save
return accepted()