YunoHost/yunorunner
1
0
Fork 0
mirror of https://github.com/YunoHost/yunorunner.git synced 2024-09-03 20:05:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] also show apps without job on the apps page

Browse source
This commit is contained in:
Laurent Peuch 2019-01-22 05:16:32 +01:00
parent a9cdea0ee2
commit 8ba3d5f242
1 changed files with 43 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
run.py
View file

@ -551,7 +551,6 @@ async def ws_apps(request, websocket):
"name" "name"
''') ''')
if len(repos):
repos = [ repos = [
{ {
"id": x.id, "id": x.id,
@ -570,16 +569,21 @@ 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 = [ # add apps without jobs
{ selected_repos = {x["name"] for x in repos}
"id": x.id, for repo in Repo.select():
"name": x.name, if repo.id in selected_repos:
"url": x.url, continue
"revision": x.revision,
"app_list": x.app_list, repos.append({
"state": x.state, "id": repo.id,
"random_job_day": x.random_job_day, "name": repo.name,
"url": repo.url,
"revision": repo.revision,
"app_list": repo.app_list,
"state": repo.state,
"random_job_day": repo.random_job_day,
"job_id": None, "job_id": None,
"job_name": None, "job_name": None,
"job_state": None, "job_state": None,
@ -587,8 +591,9 @@ async def ws_apps(request, websocket):
"created_time": None, "created_time": None,
"started_time": None, "started_time": None,
"end_time": None, "end_time": None,
} for x in Repo.select() })
]
repos = sorted(repos, key=lambda x: x["name"])
await websocket.send(ujson.dumps({ await websocket.send(ujson.dumps({
"action": "init_apps", "action": "init_apps",