[mod] if not job, list apps without jobs

This commit is contained in:
Laurent Peuch 2019-01-22 03:19:01 +01:00
parent 4eee2a056d
commit 5b7f47dbbf

20
run.py
View file

@ -511,6 +511,7 @@ async def ws_apps(request, websocket):
"name" "name"
''') ''')
if len(repos):
repos = [ repos = [
{ {
"id": x.id, "id": x.id,
@ -529,6 +530,25 @@ async def ws_apps(request, websocket):
"end_time": datetime.strptime(x.end_time.split(".")[0], '%Y-%m-%d %H:%M:%S') if x.end_time else None, "end_time": datetime.strptime(x.end_time.split(".")[0], '%Y-%m-%d %H:%M:%S') if x.end_time else None,
} for x in repos } for x in repos
] ]
else:
repos = [
{
"id": x.id,
"name": x.name,
"url": x.url,
"revision": x.revision,
"app_list": x.app_list,
"state": x.state,
"random_job_day": x.random_job_day,
"job_id": "",
"job_name": "",
"job_state": "",
"log": "",
"created_time": "",
"started_time": "",
"end_time": "",
} for x in Repo.select()
]
await websocket.send(ujson.dumps({ await websocket.send(ujson.dumps({
"action": "init_apps", "action": "init_apps",