Store default asset store id in database

midasplatform · Dec 12, 2014 · a4c1a86 · a4c1a86
1 parent c22cd88
commit a4c1a86
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/core/configs/application.ini b/core/configs/application.ini
@@ -11,8 +11,6 @@ application.description =
 application.lang = "en"
 ; session lifetime (minutes)
 session.lifetime = "20"
-; default asset store
-defaultassetstore.id =
 ; default time zone
 default.timezone = "America/New_York"
 ; default license

diff --git a/core/controllers/AdminController.php b/core/controllers/AdminController.php
@@ -23,7 +23,7 @@
  */
 class AdminController extends AppController
 {
-    public $_models = array('Assetstore', 'Bitstream', 'Item', 'ItemRevision', 'Folder', 'License');
+    public $_models = array('Assetstore', 'Bitstream', 'Item', 'ItemRevision', 'Folder', 'License', 'Setting');
     public $_daos = array();
     public $_components = array('Upgrade', 'Utility', 'MIDAS2Migration');
     public $_forms = array('Admin', 'Assetstore', 'Migrate');
@@ -187,7 +187,7 @@ public function indexAction()
         if (!$defaultSet) {
             foreach ($assetstores as $key => $assetstore) {
                 $assetstores[$key]->default = true;
-                $config->global->defaultassetstore->id = $assetstores[$key]->getKey();
+                $this->Setting->setConfig('default_assetstore', $assetstores[$key]->getKey());
 
                 $writer = new Zend_Config_Writer_Ini();
                 $writer->setConfig($config);

diff --git a/core/controllers/InstallController.php b/core/controllers/InstallController.php
@@ -23,7 +23,7 @@
  */
 class InstallController extends AppController
 {
-    public $_models = array('User', 'Assetstore');
+    public $_models = array('User', 'Assetstore', 'Setting');
     public $_daos = array('Assetstore');
     public $_components = array('Random', 'Utility');
     public $_forms = array('Install');
@@ -268,14 +268,15 @@ public function step3Action()
             $config->global->application->lang = $form->getValue('lang');
             $config->global->application->name = $form->getValue('name');
             $config->global->default->timezone = $form->getValue('timezone');
-            $config->global->defaultassetstore->id = $assetstores[0]->getKey();
             $config->global->environment = 'production';
 
             $writer = new Zend_Config_Writer_Ini();
             $writer->setConfig($config);
             $writer->setFilename(APPLICATION_CONFIG);
             $writer->write();
 
+            $this->Setting->setConfig('default_assetstore', $assetstores[0]->getKey());
+
             $this->redirect('/admin#tabs-modules');
         }
     }

diff --git a/modules/demo/controllers/components/DemoComponent.php b/modules/demo/controllers/components/DemoComponent.php
@@ -80,9 +80,12 @@ public function reset()
         $assetstoreDao->setType(MIDAS_ASSETSTORE_LOCAL);
         $assetstoreModel->save($assetstoreDao);
 
+        /** @var SettingModel $settingModel */
+        $settingModel = MidasLoader::loadModel('Setting');
+        $settingModel->setConfig('default_assetstore', $assetstoreDao->getKey());
+
         $options = array('allowModifications' => true);
         $config = new Zend_Config_Ini(CORE_CONFIGS_PATH.'/application.ini', null, $options);
-        $config->global->defaultassetstore->id = $assetstoreDao->getKey();
         $config->global->dynamichelp = 1;
         $config->global->environment = 'production';
         $config->global->application->name = 'Midas Platform - Demo';