diff --git a/pandora/taskqueue/views.py b/pandora/taskqueue/views.py index c765f35b..49c2ef9c 100644 --- a/pandora/taskqueue/views.py +++ b/pandora/taskqueue/views.py @@ -44,7 +44,10 @@ def cancelTask(request, data): if not isinstance(ids, list): ids = [ids] for id in ids: - task = models.Task.get(id) + try: + task = models.Task.get(id) + except models.Task.DoesNotExist: + continue if task.user != request.user and not request.user.profile.capability('canSeeAllTasks'): response = json_response(status=403, text='permission denied') return render_to_json_response(response) diff --git a/static/js/home.js b/static/js/home.js index 980151f9..e03983ce 100644 --- a/static/js/home.js +++ b/static/js/home.js @@ -261,20 +261,21 @@ pandora.ui.home = function() { var height = $logo.height(); if (width == 0 || height == 0) { setTimeout(adjustRatio, 50); - } - var aspect = width / height; - if (aspect != 2) { - var top = 320 / aspect; - $reflectionImage.css({ - top: top + 'px', - }) - $reflectionGradient.css({ - top: top + 'px', - height: (top + 2) + 'px', - }) - $logo.css({ - bottom: top + 'px', - }) + } else { + var aspect = width / height; + if (aspect != 2) { + var top = 320 / aspect; + $reflectionImage.css({ + top: top + 'px', + }) + $reflectionGradient.css({ + top: top + 'px', + height: (top + 2) + 'px', + }) + $logo.css({ + bottom: top + 'px', + }) + } } } diff --git a/static/js/infoView.indiancinema.js b/static/js/infoView.indiancinema.js index 8da847a6..4818be62 100644 --- a/static/js/infoView.indiancinema.js +++ b/static/js/infoView.indiancinema.js @@ -623,6 +623,8 @@ pandora.ui.infoView = function(data) { edit[key] = value ? Ox.decodeHTMLEntities(value).split('; ').map(Ox.encodeHTMLEntities) : []; + } else if (key == 'imdbId') { + edit[key] = value.match(/\d{7}/)[0]; } else { edit[key] = value; }