fix staging env, fix imports for streaming

diff --git a/env/staging.env b/env/staging.env
index d82e00470e1f648189de38c8cca1395564505374..90cb743654d3c7e15618a63828a7875ac7168844 100644 (file)
--- a/env/staging.env
+++ b/env/staging.env
@@ -1,4 +1,7 @@
-BRAHMS_ENV=STAGING
 DEBUG=True
-GITLAB_USER=www-data
-GITLAB_PWD=s%27%2F%408W%3B%5EC%5EU%7Bq%5CC%3A%29WEu-fVeX%23Y%24tx
\ No newline at end of file
+
+DB_PORT=5432
+DB_HOST=postgres
+POSTGRES_PASSWORD=mysecretpassword
+POSTGRES_DATABASE=teleforma
+POSTGRES_USER=teleforma

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index acb22b079b382b8b5278ccc3e852641074b8d265..6aacf4e3180f2103c720c6bcd2b8bdb0886dafce 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -71,6 +71,7 @@ from ..models.chat import ChatMessage
 from ..models.core import (Conference, Course, CourseType, Department,
                            Document, DocumentType, Media, MediaTranscoded,
                            Organization, Period, Professor, WebClassGroup,
+                           StreamingServer, LiveStream,
                            get_user_role)
 from ..webclass.models import Webclass, WebclassRecord
 from .pages import get_page_content
@@ -729,7 +730,6 @@ class ConferenceView(CourseAccessMixin, DetailView):
                 conference = Conference()
                 conference.from_json_dict(conf_dict)
                 conference.save()
-
                 if conference.streaming:
                     for stream in conf_dict['streams']:
                         host = getattr(