Compare commits

..

No commits in common. "6c1aa50ed2e28a6758243adf52ad7ae06da24f15" and "7c320c7614946cc1b83894b4634101dd3d148fb4" have entirely different histories.

3 changed files with 15 additions and 21 deletions

View file

@ -44,10 +44,7 @@ def cancelTask(request, data):
if not isinstance(ids, list): if not isinstance(ids, list):
ids = [ids] ids = [ids]
for id in ids: for id in ids:
try: task = models.Task.get(id)
task = models.Task.get(id)
except models.Task.DoesNotExist:
continue
if task.user != request.user and not request.user.profile.capability('canSeeAllTasks'): if task.user != request.user and not request.user.profile.capability('canSeeAllTasks'):
response = json_response(status=403, text='permission denied') response = json_response(status=403, text='permission denied')
return render_to_json_response(response) return render_to_json_response(response)

View file

@ -261,21 +261,20 @@ pandora.ui.home = function() {
var height = $logo.height(); var height = $logo.height();
if (width == 0 || height == 0) { if (width == 0 || height == 0) {
setTimeout(adjustRatio, 50); setTimeout(adjustRatio, 50);
} else { }
var aspect = width / height; var aspect = width / height;
if (aspect != 2) { if (aspect != 2) {
var top = 320 / aspect; var top = 320 / aspect;
$reflectionImage.css({ $reflectionImage.css({
top: top + 'px', top: top + 'px',
}) })
$reflectionGradient.css({ $reflectionGradient.css({
top: top + 'px', top: top + 'px',
height: (top + 2) + 'px', height: (top + 2) + 'px',
}) })
$logo.css({ $logo.css({
bottom: top + 'px', bottom: top + 'px',
}) })
}
} }
} }

View file

@ -623,8 +623,6 @@ pandora.ui.infoView = function(data) {
edit[key] = value edit[key] = value
? Ox.decodeHTMLEntities(value).split('; ').map(Ox.encodeHTMLEntities) ? Ox.decodeHTMLEntities(value).split('; ').map(Ox.encodeHTMLEntities)
: []; : [];
} else if (key == 'imdbId') {
edit[key] = value.match(/\d{7}/)[0];
} else { } else {
edit[key] = value; edit[key] = value;
} }