Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
This commit is contained in:
commit
bc2c8aa1f0
1 changed files with 3 additions and 3 deletions
|
@ -75,7 +75,7 @@ def create_project(token):
|
||||||
|
|
||||||
|
|
||||||
try:
|
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:
|
except Exception as e:
|
||||||
print e
|
print e
|
||||||
return bad_request()
|
return bad_request()
|
||||||
|
@ -86,8 +86,8 @@ def create_project(token):
|
||||||
print e
|
print e
|
||||||
pass
|
pass
|
||||||
|
|
||||||
project.info = json.dumps(get_github_data(project.gitRepository))
|
|
||||||
db.put(project)
|
db.put(project)
|
||||||
|
project.info = json.dumps(get_github_data(project.gitRepository, project.key().id()))
|
||||||
|
|
||||||
#update user projects list
|
#update user projects list
|
||||||
user.projects_id_list.append(str(project.key().id()))
|
user.projects_id_list.append(str(project.key().id()))
|
||||||
|
@ -395,7 +395,7 @@ def updateProjectsInfo():
|
||||||
try:
|
try:
|
||||||
projects = Project.all()
|
projects = Project.all()
|
||||||
for project in projects.run():
|
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.put(project)
|
||||||
db.save
|
db.save
|
||||||
return accepted()
|
return accepted()
|
||||||
|
|
Loading…
Reference in a new issue