From e38a4fd198506e42a1a300064493461d92e4d56d Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 13 Sep 2016 16:54:24 -0400 Subject: [PATCH] ProcessingNode display in left menu --- app/models.py | 2 +- app/templates/app/logged_in_base.html | 13 ++++++------- app/templatetags/processingnode_extras.py | 8 ++++++++ screenshots/ui-mockup.png | Bin 14884 -> 22971 bytes 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 app/templatetags/processingnode_extras.py diff --git a/app/models.py b/app/models.py index 90915d0b..f7024771 100644 --- a/app/models.py +++ b/app/models.py @@ -26,7 +26,7 @@ class ProcessingNode(models.Model): queue_count = models.PositiveIntegerField(default=0, help_text="Number of tasks currently being processed by this node (as reported by the node itself)") available_options = fields.JSONField(default=dict(), help_text="Description of the options that can be used for processing") def __str__(self): - return '{}:{} ({})'.format(self.hostname, self.port, self.api_version or "?") + return '{}:{}'.format(self.hostname, self.port) def gcp_directory_path(task, filename): diff --git a/app/templates/app/logged_in_base.html b/app/templates/app/logged_in_base.html index 44c478f9..cbd42c6f 100644 --- a/app/templates/app/logged_in_base.html +++ b/app/templates/app/logged_in_base.html @@ -243,15 +243,14 @@
  • Processing Nodes