merge master.

mediathread/assetmgr/api.py

@@ -217,9 +217,12 @@ def dehydrate(self, bundle):
         return bundle
 
     def render_one(self, request, item):
-        bundle = self.build_bundle(obj=item, request=request)
-        dehydrated = self.full_dehydrate(bundle)
-        return self._meta.serializer.to_simple(dehydrated, None)
+        try:
+            bundle = self.build_bundle(obj=item, request=request)
+            dehydrated = self.full_dehydrate(bundle)
+            return self._meta.serializer.to_simple(dehydrated, None)
+        except Source.DoesNotExist:
+            return None
 
     def render_list(self, request, object_list):
         bundle = Bundle(request=request)
@@ -228,7 +231,8 @@ def render_list(self, request, object_list):
         asset_json = []
         for asset in object_list:
             the_json = self.render_one(request, asset)
-            asset_json.append(the_json)
+            if the_json:
+                asset_json.append(the_json)
 
         asset_json = sorted(asset_json,
                             key=lambda asset: asset['modified'],
@@ -306,9 +310,12 @@ def dehydrate(self, bundle):
         return bundle
 
     def render_one(self, request, item):
-        bundle = self.build_bundle(obj=item, request=request)
-        dehydrated = self.full_dehydrate(bundle)
-        return self._meta.serializer.to_simple(dehydrated, None)
+        try:
+            bundle = self.build_bundle(obj=item, request=request)
+            dehydrated = self.full_dehydrate(bundle)
+            return self._meta.serializer.to_simple(dehydrated, None)
+        except Source.DoesNotExist:
+            return None
 
     def render_list(self, request, object_list):
         bundle = Bundle(request=request)
@@ -321,7 +328,9 @@ def render_list(self, request, object_list):
         asset_json = []
         for asset in object_list:
             the_json = self.render_one(request, asset)
-            asset_json.append(the_json)
+            if the_json:
+                asset_json.append(the_json)
+
         asset_json = sorted(asset_json,
                             key=lambda asset: asset['modified'],
                             reverse=True)

mediathread/assetmgr/models.py

@@ -45,8 +45,11 @@ def annotated_by(self, course, user, include_archives=False):
         else:
             to_return = []
             for asset in fassets:
-                if asset.primary.label != 'archive':
-                    to_return.append(asset)
+                try:
+                    if asset.primary.label != 'archive':
+                        to_return.append(asset)
+                except Source.DoesNotExist:
+                    pass  # ignore this error
             return to_return
 
     def migrate(self, asset_set, course, user, object_map):

mediathread/assetmgr/views.py

@@ -11,6 +11,7 @@
     HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext, loader
+from django.views.generic.simple import direct_to_template
 from djangohelpers.lib import allow_http
 from mediathread.api import UserResource, TagResource
 from mediathread.assetmgr.api import AssetResource, AssetSummaryResource
@@ -83,8 +84,13 @@ def asset_workspace(request, asset_id=None, annot_id=None):
     if asset_id:
         try:
             asset = Asset.objects.get(pk=asset_id, course=request.course)
+            asset.primary
         except Asset.DoesNotExist:
             return asset_switch_course(request, asset_id)
+        except Source.DoesNotExist:
+            response = direct_to_template(request, "500.html", {})
+            response.status_code = 500
+            return response
 
     data = {'space_owner': request.user.username,
             'asset_id': asset_id,

mediathread/main/admin.py

@@ -7,6 +7,7 @@ class Meta:
         model = UserSetting
 
     list_display = ("user", "name", "value")
+    search_fields = ("user__username",)
 
 
 admin.site.register(UserSetting, UserSettingAdmin)

mediathread/settings_dev.py

@@ -1,6 +1,17 @@
 # flake8: noqa
 from mediathread.settings import *
 
+TEMPLATE_DIRS = (
+    "/var/www/mediathread/mediathread/mediathread/deploy_specific/templates",
+    "/var/www/mediathread/mediathread/mediathread/templates",
+)
+
+MEDIA_ROOT = '/var/www/mediathread/uploads/'
+# put any static media here to override app served static media
+STATICMEDIA_MOUNTS = (
+    ('/sitemedia', '/var/www/mediathread/mediathread/sitemedia'),
+)
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
@@ -12,13 +23,11 @@
     }
 }
 
-DEBUG = False
+COMPRESS_ROOT = "/var/www/mediathread/mediathread/media/"
+DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 DEV_ENV = True
 
-if 'migrate' not in sys.argv:
-    INSTALLED_APPS.append('raven.contrib.django.raven_compat')
-
 try:
     from local_settings import *
 except ImportError:

mediathread/settings_production.py

@@ -3,6 +3,17 @@
 
 USE_X_FORWARDED_HOST = True
 
+TEMPLATE_DIRS = (
+    "/var/www/mediathread/mediathread/mediathread/deploy_specific/templates",
+    "/var/www/mediathread/mediathread/mediathread/templates",
+)
+
+MEDIA_ROOT = '/var/www/mediathread/uploads/'
+# put any static media here to override app served static media
+STATICMEDIA_MOUNTS = (
+    ('/sitemedia', '/var/www/mediathread/mediathread/sitemedia'),
+)
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
@@ -14,9 +25,12 @@
     }
 }
 
+COMPRESS_ROOT = "/var/www/mediathread/mediathread/media/"
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
+SENTRY_SITE = 'mediathread'
+
 if 'migrate' not in sys.argv:
     INSTALLED_APPS.append('raven.contrib.django.raven_compat')
 

mediathread/settings_staging.py

@@ -1,6 +1,17 @@
 # flake8: noqa
 from mediathread.settings import *
 
+TEMPLATE_DIRS = (
+    "/var/www/mediathread/mediathread/mediathread/deploy_specific/templates",
+    "/var/www/mediathread/mediathread/mediathread/templates",
+)
+
+MEDIA_ROOT = '/var/www/mediathread/uploads/'
+# put any static media here to override app served static media
+STATICMEDIA_MOUNTS = (
+    ('/sitemedia', '/var/www/mediathread/mediathread/sitemedia'),
+)
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
@@ -12,6 +23,7 @@
     }
 }
 
+COMPRESS_ROOT = "/var/www/mediathread/mediathread/media/"
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 STAGING_ENV = True

mediathread/settings_test.py

@@ -17,7 +17,7 @@
 }
 
 LETTUCE_SERVER_PORT = 8002
-BROWSER = 'Headless'  # ["Chrome", "Firefox", "Headless"}
+BROWSER = 'Firefox'  # ["Chrome", "Firefox", "Headless"}
 
 LETTUCE_APPS = (
     'mediathread.main',

mediathread/templates/500.html

@@ -6,7 +6,7 @@
 
 <div id="content">
 
-    <h3>505: An error has occurred</h3>
+    <h3>500: An error has occurred</h3>
 
     We're sorry. Something's gone wrong. We will investigate and resolve this problem as soon as possible.<br /><br />