Commit 0d61645e by Gregory Martin

update

parent 9a18f255
...@@ -4,3 +4,5 @@ ...@@ -4,3 +4,5 @@
*.pyc *.pyc
static/admin/ static/admin/
sandbox.db
from django.contrib import admin from django.contrib import admin
from pipeline.models import Course from VEDA_OS01.models import Course
from pipeline.models import Video from VEDA_OS01.models import Video
from pipeline.models import Encode from VEDA_OS01.models import Encode
from pipeline.models import URL from VEDA_OS01.models import URL
from pipeline.models import Destination from VEDA_OS01.models import Destination
from pipeline.models import Institution from VEDA_OS01.models import Institution
from pipeline.models import VedaUpload from VEDA_OS01.models import VedaUpload
class CourseAdmin(admin.ModelAdmin): class CourseAdmin(admin.ModelAdmin):
......
...@@ -20,8 +20,8 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings' ...@@ -20,8 +20,8 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings'
django.setup() django.setup()
from pipeline.models import Institution from VEDA_OS01.models import Institution
from pipeline.models import Course from VEDA_OS01.models import Course
from pipeline.models import Video from VEDA_OS01.models import Video
from pipeline.models import URL from VEDA_OS01.models import URL
from pipeline.models import VedaUpload from VEDA_OS01.models import VedaUpload
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
from rest_framework import serializers from rest_framework import serializers
from pipeline.models import Course, Video, URL, Encode from VEDA_OS01.models import Course, Video, URL, Encode
class CourseSerializer(serializers.ModelSerializer): class CourseSerializer(serializers.ModelSerializer):
......
...@@ -11,11 +11,11 @@ from rest_framework import filters ...@@ -11,11 +11,11 @@ from rest_framework import filters
from api import token_finisher from api import token_finisher
from pipeline.models import Course, Video, URL, Encode from VEDA_OS01.models import Course, Video, URL, Encode
from pipeline.serializers import CourseSerializer from VEDA_OS01.serializers import CourseSerializer
from pipeline.serializers import VideoSerializer from VEDA_OS01.serializers import VideoSerializer
from pipeline.serializers import EncodeSerializer from VEDA_OS01.serializers import EncodeSerializer
from pipeline.serializers import URLSerializer from VEDA_OS01.serializers import URLSerializer
class CourseViewSet(viewsets.ModelViewSet): class CourseViewSet(viewsets.ModelViewSet):
......
...@@ -12,7 +12,7 @@ if project_path not in sys.path: ...@@ -12,7 +12,7 @@ if project_path not in sys.path:
from control.celeryapp import maintainer_healer from control.celeryapp import maintainer_healer
from control.veda_heal import VedaHeal from control.veda_heal import VedaHeal
from pipeline.models import Video from VEDA_OS01.models import Video
""" """
Deliver Deliver
......
...@@ -139,7 +139,7 @@ INSTALLED_APPS = ( ...@@ -139,7 +139,7 @@ INSTALLED_APPS = (
'rest_framework', 'rest_framework',
'corsheaders', 'corsheaders',
'frontend', 'frontend',
'pipeline', 'VEDA_OS01',
) )
CORS_ORIGIN_ALLOW_ALL = True CORS_ORIGIN_ALLOW_ALL = True
......
...@@ -9,7 +9,7 @@ from rest_framework.routers import DefaultRouter ...@@ -9,7 +9,7 @@ from rest_framework.routers import DefaultRouter
from django.conf.urls import patterns, include, url from django.conf.urls import patterns, include, url
from django.contrib import admin from django.contrib import admin
from pipeline import views from VEDA_OS01 import views
router = DefaultRouter() router = DefaultRouter()
admin.autodiscover() admin.autodiscover()
......
...@@ -18,13 +18,13 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings' ...@@ -18,13 +18,13 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings'
django.setup() django.setup()
from pipeline.models import Institution from VEDA_OS01.models import Institution
from pipeline.models import Course from VEDA_OS01.models import Course
from pipeline.models import Video from VEDA_OS01.models import Video
from pipeline.models import Destination from VEDA_OS01.models import Destination
from pipeline.models import Encode from VEDA_OS01.models import Encode
from pipeline.models import URL from VEDA_OS01.models import URL
from pipeline.models import VedaUpload from VEDA_OS01.models import VedaUpload
""" """
Central Config Central Config
......
...@@ -18,11 +18,11 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'VEDA.settings' ...@@ -18,11 +18,11 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'VEDA.settings'
django.setup() django.setup()
from pipeline.models import Institution from VEDA_OS01.models import Institution
from pipeline.models import Course from VEDA_OS01.models import Course
from pipeline.models import Video from VEDA_OS01.models import Video
from pipeline.models import URL from VEDA_OS01.models import URL
from pipeline.models import VedaUpload from VEDA_OS01.models import VedaUpload
""" """
TERM COLORS TERM COLORS
......
...@@ -11,7 +11,7 @@ if project_path not in sys.path: ...@@ -11,7 +11,7 @@ if project_path not in sys.path:
from control.celeryapp import deliverable_route from control.celeryapp import deliverable_route
from control.veda_heal import VedaHeal from control.veda_heal import VedaHeal
from pipeline.models import Video from VEDA_OS01.models import Video
def get_videos(): def get_videos():
......
...@@ -9,7 +9,7 @@ if project_path not in sys.path: ...@@ -9,7 +9,7 @@ if project_path not in sys.path:
sys.path.append(project_path) sys.path.append(project_path)
from control.veda_heal import VedaHeal from control.veda_heal import VedaHeal
from pipeline.models import URL, Encode, Video from VEDA_OS01.models import URL, Encode, Video
""" """
Set your globals here Set your globals here
......
...@@ -11,7 +11,7 @@ import newrelic.agent ...@@ -11,7 +11,7 @@ import newrelic.agent
from django.utils.timezone import utc from django.utils.timezone import utc
from pipeline.models import Course, Video, Encode, URL from VEDA_OS01.models import Course, Video, Encode, URL
""" """
Import Django Shit Import Django Shit
......
...@@ -24,7 +24,7 @@ if project_path not in sys.path: ...@@ -24,7 +24,7 @@ if project_path not in sys.path:
os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings'
django.setup() django.setup()
from pipeline.models import Video, Encode, URL from VEDA_OS01.models import Video, Encode, URL
from frontend.abvid_reporting import report_status from frontend.abvid_reporting import report_status
from control.veda_val import VALAPICall from control.veda_val import VALAPICall
from control.veda_utils import ErrorObject, Metadata, VideoProto from control.veda_utils import ErrorObject, Metadata, VideoProto
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment