diff --git a/spa/models/Comment.py b/spa/models/Comment.py index 4f113aa..9064aa7 100644 --- a/spa/models/Comment.py +++ b/spa/models/Comment.py @@ -1,7 +1,7 @@ from django.contrib.auth.models import User from django.db import models from spa.models._BaseModel import _BaseModel -from spa.models.Mix import Mix +%from spa.models.Mix import Mix class Comment(_BaseModel): class Meta: diff --git a/spa/models/Mix.py b/spa/models/Mix.py index f8275d5..2f1d35d 100644 --- a/spa/models/Mix.py +++ b/spa/models/Mix.py @@ -2,6 +2,7 @@ from django.contrib.sites.models import Site import os import rfc822 from sorl.thumbnail import get_thumbnail +from sorl.thumbnail.helpers import ThumbnailError from core.utils import url from datetime import datetime from django.db import models @@ -74,8 +75,11 @@ class Mix(_BaseModel): return url.urlclean(ret) def get_image_url(self): - ret = get_thumbnail(self.mix_image, '120x120', crop='center') - return "%s/%s" % (settings.MEDIA_URL, ret.name) + try: + ret = get_thumbnail(self.mix_image, '120x120', crop='center') + return "%s/%s" % (settings.MEDIA_URL, ret.name) + except ThumbnailError: + return "%s/%s" % (settings.STATIC_URL, 'img/default-track.png') #return super(Mix, self).get_image_url(self.mix_image, settings.STATIC_URL + 'img/default-track.png') def get_stream_path(self): diff --git a/static/js/app/views/mix.js b/static/js/app/views/mix.js index 163bc14..261a4ff 100644 --- a/static/js/app/views/mix.js +++ b/static/js/app/views/mix.js @@ -233,7 +233,7 @@ window.MixCreateView = DSSEditableView.extend({ $('.fileupload', this.el).fileupload({ 'uploadtype':'image' }); - $('#mix-details', this.el).hide(); + //$('#mix-details', this.el).hide(); $('.upload-hash', this.el).val(this.guid); } else { $('#div-upload-mix', this.el).hide(); @@ -274,6 +274,13 @@ window.MixCreateView = DSSEditableView.extend({ }); } callback(result); + }, + createSearchChoice:function (term, data) { + if ($(data).filter(function () { + return this.text.localeCompare(term) === 0; + }).length === 0) { + return {id:term, text:term}; + } } }); return this;