ENH: 0009653: Add a browser in the import page to select where import

Author: Charles Marion

core/controllers/AdminController.php

@@ -329,13 +329,17 @@ function upgradeAction()
    */
   function serversidefilechooserAction()
     {
-    $userid = $this->CheckSession();
-    if(!$this->User->isAdmin($userid))
+    if(!$this->logged)
       {
-      echo "Administrative privileges required";
-      exit ();
+      throw new Zend_Exception("You should be logged in");
       }
-      
+    if(!$this->userSession->Dao->isAdmin())
+      {
+      throw new Zend_Exception("Administrative privileges required");
+      }     
+    
+    $this->_helper->layout->disableLayout();
+    $this->_helper->viewRenderer->setNoRender();
 
     // Display the tree
     $_POST['dir'] = urldecode($_POST['dir']);
@@ -386,7 +390,6 @@ function serversidefilechooserAction()
       echo "File ".$_POST['dir']." doesn't exist";
       }     
     // No views  
-    exit();
     } // end function  serversidefilechooserAction
 
 
@@ -396,8 +399,9 @@ function serversidefilechooserAction()
    */
   function migratemidas2Action()
     {
+    $this->_helper->layout->disableLayout();
+    $this->_helper->viewRenderer->setNoRender();
     $this->Component->MIDAS2Migration->migrate();
-    exit();  
     }
 
 } // end class

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

@@ -14,7 +14,7 @@ $(document).ready(function()
   $('#inputdirectory').change(function(){inputdirectoryChanged()});
 
   // Form for the new assetstore
-  options = { success:assetstoreAddCallback, beforeSubmit:  assetstoreSubmit,  dataType:'json' }; 
+  options = {success:assetstoreAddCallback, beforeSubmit:  assetstoreSubmit,  dataType:'json'}; 
   $('#assetstoreForm').ajaxForm(options);
 
   // Load the window for the new assetstore
@@ -33,6 +33,18 @@ $(document).ready(function()
   $("#assetstoretype").attr('disabled', 'disabled');
 
   importSubmitButtonValue = $("#importsubmit").html();
+  
+  //Init Browser
+  $('input[name=importFolder]').val('');
+  $('input[name=importFolder]').attr('id','destinationId');
+  $('input[name=importFolder]').hide();
+  $('input[name=importFolder]').before('<input style="margin-left:0px;" id="browseMIDASLink" class="globalButton" type="button" value="Select location" />');
+  $('input[name=importFolder]').before('<span style="margin-left:5px;" id="destinationUpload"/>');
+  $('#browseMIDASLink').click(function()
+    {
+    loadDialog("select","/browse/movecopy/?selectElement=true");
+    showDialog('Browse');
+    });
  });