diff --git a/app/common b/app/common index 46895ee..1a9515a 160000 --- a/app/common +++ b/app/common @@ -1 +1 @@ -Subproject commit 46895ee502b1873ca74f5ca274d1bbf81c035460 +Subproject commit 1a9515a0e359ab708d966dee3a0fb8733c6ba4b9 diff --git a/app/service/view.py b/app/service/view.py index 4a1f237..0b87a92 100644 --- a/app/service/view.py +++ b/app/service/view.py @@ -73,8 +73,6 @@ class ServiceView(FlaskView): oid=stream.output.urls[0].id) elif stream_type == constants.StreamType.CATCHUP: stream = server.make_catchup_stream() - stream.output.urls[0] = stream.generate_http_link(constants.HlsType.HLS_PULL, - oid=stream.output.urls[0].id) else: stream = server.make_test_life_stream() diff --git a/app/stream/view.py b/app/stream/view.py index c8c8fef..95ff47e 100644 --- a/app/stream/view.py +++ b/app/stream/view.py @@ -269,7 +269,7 @@ class StreamView(FlaskView): if server: stream = server.make_catchup_stream() form = CatchupStreamForm(obj=stream) - if request.method == 'POST' and form.validate_on_submit(): + if request.method == 'POST': # FIXME form.validate_on_submit() new_entry = form.update_entry(stream) new_entry.save() server.add_stream(new_entry) diff --git a/app/templates/stream/catchup/base.html b/app/templates/stream/catchup/base.html index 1d65a10..1018169 100644 --- a/app/templates/stream/catchup/base.html +++ b/app/templates/stream/catchup/base.html @@ -54,8 +54,6 @@
{{ render_bootstrap_form(form.input) }}
- {{ render_bootstrap_form(form.output) }} -
{{ render_bootstrap_form(form.timeshift_chunk_duration) }}
{{ render_bootstrap_form(form.timeshift_chunk_life_time) }}