fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2026-03-03 20:34:00 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Fixed missing thumbnail error

Browse Source
This commit is contained in:
Fergal Moran
2012-10-25 12:28:02 +01:00
parent da7a1a3832
commit 629db12d0a
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spa/models/Comment.py
View File

@@ -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:

8
spa/models/Mix.py
View File

@@ -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):

9
static/js/app/views/mix.js
View File

@@ -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;