From eea4e74084379c88f04b2be86d51325e12f1e008 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 12 Sep 2012 23:35:35 +0100 Subject: [PATCH] Fixed missing image handler --- spa/models/Mix.py | 9 ++++++--- static/js/app/views/mix.js | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/spa/models/Mix.py b/spa/models/Mix.py index 4786769..0f3c788 100644 --- a/spa/models/Mix.py +++ b/spa/models/Mix.py @@ -55,12 +55,15 @@ class Mix(_BaseModel): def get_image(self): try: - image_root = localsettings.IMAGE_URL if hasattr(localsettings, 'IMAGE_URL') else settings.MEDIA_URL - ret = "%s/%s" % (image_root, self.mix_image.name) - return ret + if os.path.isfile(self.mix_image.file): + image_root = localsettings.IMAGE_URL if hasattr(localsettings, 'IMAGE_URL') else settings.MEDIA_URL + ret = "%s/%s" % (image_root, self.mix_image.name) + return ret except: return settings.STATIC_URL + 'img/default-track.png' + return settings.STATIC_URL + 'img/default-track.png' + def get_stream_path(self): #return 'media/%s/' % self.local_file.name return '/audio/stream/%d' % self.id; diff --git a/static/js/app/views/mix.js b/static/js/app/views/mix.js index 9e7ee85..37f3a17 100644 --- a/static/js/app/views/mix.js +++ b/static/js/app/views/mix.js @@ -166,6 +166,7 @@ window.MixCreateView = DSSEditableView.extend({ if (this.model.id == undefined) { $('#mix-upload', this.el).uploadifive({ 'uploadScript':'ajax/upload_mix_file_handler/', + 'buttonText': "Select audio file (mp3 for now please)", 'formData':{ 'upload-hash':this.guid },