ENH: refs #0290. Adding a default assetstore by convention not config.

Author: cpatrick

core/controllers/AdminController.php

@@ -153,7 +153,7 @@ function indexAction()
       }
 
     // get assetstore data
-    $defaultAssetStoreId = Zend_Registry::get('configGlobal')->defaultassetstore->id;
+    $defaultAssetStoreId = $this->Assetstore->getDefault()->getKey();
     $assetstores = $this->Assetstore->getAll();
     $defaultSet = false;
     foreach($assetstores as $key => $assetstore)

core/controllers/components/UploadComponent.php

@@ -162,9 +162,8 @@ public function createLinkItem($userDao, $name, $url, $parent = null)
     $bitstreamDao->setSizebytes(0);
     $bitstreamDao->setChecksum(' ');
 
-    $defaultAssetStoreId = Zend_Registry::get('configGlobal')->defaultassetstore->id;
-    $bitstreamDao->setAssetstoreId($defaultAssetStoreId);
-    $assetstoreDao = $assetstoreModel->load($defaultAssetStoreId);
+    $assetstoreDao = $assetstoreModel->getDefault();
+    $bitstreamDao->setAssetstoreId($assetstoreDao->getKey());
 
     $itemRevisionModel->addBitstream($itemRevisionDao, $bitstreamDao);
 
@@ -238,9 +237,8 @@ public function createUploadedItem($userDao, $name, $path, $parent = null, $lice
     $bitstreamDao->setChecksum($filemd5);
     $bitstreamDao->fillPropertiesFromPath();
 
-    $defaultAssetStoreId = Zend_Registry::get('configGlobal')->defaultassetstore->id;
-    $bitstreamDao->setAssetstoreId($defaultAssetStoreId);
-    $assetstoreDao = $assetstoreModel->load($defaultAssetStoreId);
+    $assetstoreDao = $assetstoreModel->getDefault();
+    $bitstreamDao->setAssetstoreId($assetstoreDao->getKey());
 
     if($assetstoreDao == false)
       {
@@ -347,9 +345,8 @@ public function createNewRevision($userDao, $name, $path, $item_revision, $chang
     $bitstreamDao->setChecksum($filemd5);
     $bitstreamDao->fillPropertiesFromPath();
 
-    $defaultAssetStoreId = Zend_Registry::get('configGlobal')->defaultassetstore->id;
-    $bitstreamDao->setAssetstoreId($defaultAssetStoreId);
-    $assetstoreDao = $assetstoreModel->load($defaultAssetStoreId);
+    $assetstoreDao = $assetstoreModel->getDefault();
+    $bitstreamDao->setAssetstoreId($assetstoreDao->getKey());
 
     // Upload the bitstream if necessary (based on the assetstore type)
     $this->uploadBitstream($bitstreamDao, $assetstoreDao);

core/models/base/AssetstoreModelBase.php

@@ -149,4 +149,17 @@ public function delete($dao)
     parent::delete($dao);
     }// delete
 
+  /**
+   * This function returns the default assetstore in the database. This
+   * is assumed to be named "Default" and is selected as such. If there
+   * is no assetsore we fail misserably, if there are more than one then
+   * we only return the "first."
+   * @return the default assetstore
+   */
+  public function getDefault()
+    {
+    $found = $this->findBy('name', 'Default');
+    return $found[0];
+    } // end getDefault
+
 } // end class AssetstoreModelBase

core/public/js/admin/admin.index.js

@@ -7,21 +7,6 @@
     $("#tabsGeneric").show();
     $('img.tabsLoading').hide()
 
-    $('a.defaultAssetstoreLink').click(function(){
-      $.post(json.global.webroot+'/assetstore/defaultassetstore', {submitDefaultAssetstore: true, element: $(this).attr('element')},
-         function(data) {
-             jsonResponse = jQuery.parseJSON(data);
-              if(jsonResponse==null)
-                {
-                  createNotive('Error',4000);
-                  return;
-                }
-              createNotive(jsonResponse[1],1500);
-              window.location.replace(json.global.webroot+'/admin#tabs-assetstore');
-              window.location.reload();
-         });
-    });   
-    
     $('a.removeAssetstoreLink').click(function()
       {
       var element = $(this).attr('element');

core/views/admin/index.phtml

@@ -78,16 +78,7 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/jquery/jquery.c
        {
        echo "<div class='assetstoreElement'>
               <b><span class='assetstoreName'>{$assetstore->getName()}</span></b>
-               (";
-       if($assetstore->default)
-         {
-         echo "<span class='defaultAssetstore' element='{$assetstore->getKey()}'>default assetstore</span>";
-         }
-       else
-         {
-         echo "<a class='defaultAssetstoreLink' element='{$assetstore->getKey()}'>set as default</a>";
-         }
-       echo ")<br/>";
+	      <br/>";
        if($assetstore->totalSpaceText==false)
          {
          echo "<b>Unable to access assetstore</b>";