From c08a1b3e62fc2e7d5fe36893ccb4de689bdb0afe Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Mon, 9 Sep 2013 18:32:01 -0400
Subject: [PATCH] Fix element name conflict

---
 cms/djangoapps/contentstore/features/upload.py | 4 ++--
 cms/djangoapps/contentstore/views/assets.py    | 4 ++--
 cms/templates/asset_index.html                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py
index 53b7b679f2..6eb96fc731 100644
--- a/cms/djangoapps/contentstore/features/upload.py
+++ b/cms/djangoapps/contentstore/features/upload.py
@@ -26,7 +26,7 @@ def upload_file(_step, file_name):
     #uploading the file itself
     path = os.path.join(TEST_ROOT, 'uploads/', file_name)
     world.browser.execute_script("$('input.file-input').css('display', 'block')")
-    world.browser.attach_file('files[]', os.path.abspath(path))
+    world.browser.attach_file('file', os.path.abspath(path))
     close_css = 'a.close-button'
     world.css_click(close_css)
 
@@ -43,7 +43,7 @@ def upload_file(_step, files_string):
     for f in files:
         path = os.path.join(TEST_ROOT, 'uploads/', f)
         world.browser.execute_script("$('input.file-input').css('display', 'block')")
-        world.browser.attach_file('files[]', os.path.abspath(path))
+        world.browser.attach_file('file', os.path.abspath(path))
     close_css = 'a.close-button'
     world.css_click(close_css)
 
diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py
index 71e4073ed2..4743622fa8 100644
--- a/cms/djangoapps/contentstore/views/assets.py
+++ b/cms/djangoapps/contentstore/views/assets.py
@@ -149,14 +149,14 @@ def upload_asset(request, org, course, coursename):
         logging.error('Could not find course' + location)
         return HttpResponseBadRequest()
 
-    if 'files[]' not in request.FILES:
+    if 'file' not in request.FILES:
         return HttpResponseBadRequest()
 
     # compute a 'filename' which is similar to the location formatting, we're
     # using the 'filename' nomenclature since we're using a FileSystem paradigm
     # here. We're just imposing the Location string formatting expectations to
     # keep things a bit more consistent
-    upload_file = request.FILES['files[]']
+    upload_file = request.FILES['file']
     filename = upload_file.name
     mime_type = upload_file.content_type
 
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 38cb0928f8..a7fa9e329e 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -130,7 +130,7 @@
         <form class="file-chooser" action="${upload_asset_callback_url}"
                                 method="post" enctype="multipart/form-data">
           <a href="#" class="choose-file-button">${_("Choose File")}</a>
-          <input type="file" class="file-input" name="files[]" multiple>
+          <input type="file" class="file-input" name="file" multiple>
         </form>
       </div>
     </div>