From 2fac5168921f236c9e312253953b62d661e598be Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 21 Apr 2016 19:01:05 +0200
Subject: [PATCH] [backend] Better order for displayed objects
---
beat/web/backend/state.py | 5 ++++-
beat/web/backend/views.py | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/beat/web/backend/state.py b/beat/web/backend/state.py
index 12a2ced4b..1b1e78755 100644
--- a/beat/web/backend/state.py
+++ b/beat/web/backend/state.py
@@ -75,5 +75,8 @@ def experiments():
return dict(
running=Experiment.objects.filter(status=Experiment.RUNNING).count(),
scheduled=Experiment.objects.filter(status=Experiment.SCHEDULED).count(),
- ls=Experiment.objects.filter(status__in=(Experiment.RUNNING, Experiment.SCHEDULED)).all(),
+ ls=Experiment.objects.filter(status__in=(Experiment.RUNNING,
+ Experiment.SCHEDULED)).order_by('author__username',
+ 'toolchain__author__username', 'toolchain__name',
+ 'toolchain__version', 'name'),
)
diff --git a/beat/web/backend/views.py b/beat/web/backend/views.py
index d94c6f927..0e408d393 100644
--- a/beat/web/backend/views.py
+++ b/beat/web/backend/views.py
@@ -74,8 +74,8 @@ def scheduler(request):
dict(
jobs=state.jobs(),
experiments=state.experiments(),
- workers=Worker.objects.all(),
- queues=Queue.objects.all(),
+ workers=Worker.objects.order_by('-active', 'name'),
+ queues=Queue.objects.order_by('memory_limit', 'max_slots_per_user'),
cache_chart_data=simplejson.dumps(cache_chart_data),
cache_gb=cache_gb,
),
--
GitLab