diff --git a/pandora/archive/views.py b/pandora/archive/views.py index 2594ea07f..d45b2b5ee 100644 --- a/pandora/archive/views.py +++ b/pandora/archive/views.py @@ -350,7 +350,7 @@ def moveMedia(request): if Item.objects.filter(itemId=data['item']).count() == 1: i = Item.objects.get(itemId=data['item']) else: - data['itemId'] = data['item'].pop().strip() + data['itemId'] = data.pop('item').strip() if len(data['itemId']) != 7: del data['itemId'] if 'director' in data and isinstance(data['director'], basestring): diff --git a/static/js/pandora/mediaView.js b/static/js/pandora/mediaView.js index 6df58533d..772999e5f 100644 --- a/static/js/pandora/mediaView.js +++ b/static/js/pandora/mediaView.js @@ -486,7 +486,7 @@ pandora.ui.mediaView = function(options, self) { pandora.api.moveMedia(data, function(result) { if ( pandora.user.ui.item == self.options.id - && pandora.user.ui.itemView == 'files' + && pandora.user.ui.itemView == 'media' ) { Ox.Request.clearCache(); // fixme: remove if (self.$switch.value()) {