From 14f58532a88126adfee209f63a5d391c7e495f8d Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Mon, 27 May 2013 13:28:35 +0000
Subject: [PATCH] use item not itemId for moveMedia

---
 pandora/archive/views.py       | 10 +++++-----
 static/js/pandora/mediaView.js |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pandora/archive/views.py b/pandora/archive/views.py
index 1b4913a23..2594ea07f 100644
--- a/pandora/archive/views.py
+++ b/pandora/archive/views.py
@@ -340,17 +340,17 @@ def moveMedia(request):
         change file / item link
         takes {
             ids: ids of files
-            itemId: new itemId
+            item: new itemId
         }
 
         returns {
         }
     '''
     data = json.loads(request.POST['data'])
-    if Item.objects.filter(itemId=data['itemId']).count() == 1:
-        i = Item.objects.get(itemId=data['itemId'])
+    if Item.objects.filter(itemId=data['item']).count() == 1:
+        i = Item.objects.get(itemId=data['item'])
     else:
-        data['itemId'] = data['itemId'].strip()
+        data['itemId'] = data['item'].pop().strip()
         if len(data['itemId']) != 7:
             del data['itemId']
             if 'director' in data and isinstance(data['director'], basestring):
@@ -377,7 +377,7 @@ def moveMedia(request):
             c.save()
             item.tasks.update_timeline.delay(itemId)
     response = json_response(text='updated')
-    response['data']['itemId'] = i.itemId
+    response['data']['item'] = i.itemId
     return render_to_json_response(response)
 actions.register(moveMedia, cache=False)
 
diff --git a/static/js/pandora/mediaView.js b/static/js/pandora/mediaView.js
index 0d57a31d1..6df58533d 100644
--- a/static/js/pandora/mediaView.js
+++ b/static/js/pandora/mediaView.js
@@ -475,7 +475,7 @@ pandora.ui.mediaView = function(options, self) {
     function moveFiles(data) {
         var data = {
             ids: self.selected,
-            itemId: self.$idInput.value()
+            item: self.$idInput.value()
         };
         ['title', 'director', 'year'].forEach(function(key) {
             data[key] = self['$' + key + 'Input'].value();
@@ -490,7 +490,7 @@ pandora.ui.mediaView = function(options, self) {
             ) {
                 Ox.Request.clearCache(); // fixme: remove
                 if (self.$switch.value()) {
-                    pandora.UI.set({item: result.data.itemId});
+                    pandora.UI.set({item: result.data.item});
                     pandora.updateItemContext();
                 } else {
                     self.$filesList.reloadList();