BUG: refs #0282. Correctly setting type of assetstore upon creation.

Author: Michael Grauer

core/controllers/AssetstoreController.php

@@ -159,7 +159,7 @@ function addAction()
       $assetstoreDao = new AssetstoreDao();
       $assetstoreDao->setName($form->name->getValue());
       $assetstoreDao->setPath($form->basedirectory->getValue());
-      $assetstoreDao->setType($form->type->getValue());
+      $assetstoreDao->setType($form->assetstoretype->getValue());
       $this->Assetstore->save($assetstoreDao);
 
       echo json_encode(array('msg' => 'The assetstore has been added.',

core/controllers/forms/AssetstoreForm.php

@@ -49,7 +49,7 @@ public function createAssetstoreForm($action = 'assetstore/add')
     // Amazon support is not yet implemented, don't present it as an option
     //                          '2' => $this->t('Amazon S3'));
 
-    $assetstoretype = new Zend_Form_Element_Select('type', array('id' => 'assetstoretype'));
+    $assetstoretype = new Zend_Form_Element_Select('assetstoretype', array('id' => 'assetstoretype'));
     $assetstoretype->setLabel('Select a type')->setMultiOptions($assetstoretypes);
     // Add a loading image
     $assetstoretype->setDescription('<div class="assetstoreLoading" style="display:none"><img src="'.$this->webroot.'/core/public/images/icons/loading.gif"/></div>')

core/public/js/import/import.index.js

@@ -130,7 +130,7 @@ function assetstoreSubmit(formData, jqForm, options)
 {
   // Add the type is the one in the main page (because it's hidden in the assetstore add page)
   var assetstoretype = new Object();
-  assetstoretype.name = 'type';
+  assetstoretype.name = 'assetstoretype';
   assetstoretype.value = $("#importassetstoretype").val();
   formData.push(assetstoretype);  
   $(".assetstoreLoading").show();