From 8822e8985b4b844b2d707bffde4f6f638e9d8428 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sat, 1 Feb 2014 14:57:28 +0100 Subject: [PATCH] update video monitor to get web server proxy streams --- teleforma/sources/models.py | 8 +++++++- teleforma/templates/teleforma/source_detail.html | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/teleforma/sources/models.py b/teleforma/sources/models.py index ea89c97c..2dde36a0 100644 --- a/teleforma/sources/models.py +++ b/teleforma/sources/models.py @@ -33,7 +33,8 @@ class Source(Model): room = ForeignKey(Room, related_name='source', verbose_name=_('room'), blank=True, null=True, on_delete=models.SET_NULL) monitors = ManyToManyField(Monitor, related_name="source", - verbose_name=_('monitors'), blank=True, null=True) + verbose_name=_('monitors'), blank=True, null=True) + class Meta: db_table = app_label + '_' + 'source' ordering = ['public_id'] @@ -41,6 +42,11 @@ class Source(Model): def __unicode__(self): return '-'.join([self.public_id, self.room.name, self.ip]) + @property + def proxy(self): + "As set in the reverse proxy pass on the web server" + return '/telecaster/' + public_id + '/' + @property def default_monitor_url(self): return 'http://' + str(self.ip) + self.monitors.all()[0].slug diff --git a/teleforma/templates/teleforma/source_detail.html b/teleforma/templates/teleforma/source_detail.html index 6d74fc85..80621a9b 100644 --- a/teleforma/templates/teleforma/source_detail.html +++ b/teleforma/templates/teleforma/source_detail.html @@ -41,7 +41,7 @@
-- 2.39.5