diff --git a/beat/web/backend/models.py b/beat/web/backend/models.py index 4dde8bb42635c52382594b3923c40d402cc43ff6..16616bc8e4290fb945f14a43283dd01c9bd2e333 100644 --- a/beat/web/backend/models.py +++ b/beat/web/backend/models.py @@ -26,6 +26,7 @@ ############################################################################### import datetime +import operator import logging logger = logging.getLogger(__name__) @@ -327,14 +328,20 @@ class Queue(models.Model): ''' - workers = [(k.worker, -k.priority, k.worker.load(), k.worker.hostname) \ - for k in self.slots if k.worker.active] + workers = [(k.worker, -k.priority, k.worker.load(), k.worker.name) \ + for k in self.slots.filter(worker__active=True)] workers = sorted(workers, key=operator.itemgetter(1,2,3)) return [w[0] for w in workers] + def splits(self): + '''Lists all job splits currently associated to this queue''' + + return JobSplit.objects.filter(job__block__queue=self) + + def as_dict(self): '''Returns a representation as a dictionary'''