Merge pull request #184 from midasplatform/rm-demo-batchmake

Remove batchmake and demo modules

app.yaml

@@ -65,4 +65,4 @@ skip_files:
   - ^(.*/)?core/configs/.*\.local\.ini$
   - ^(.*/)?(\.git|\.idea|\.vagrant|data|docs|env|log|provisioning|site|tests|tmp|utils)/.*
   - ^(.*/)?(core|modules/.*)/(database/(pgsql|sqlite)|tests)/.*
-  - ^(.*/)?modules/(archive|batchmake|dicom.*|javauploaddownload|metadataextractor|pvw|remoteprocessing|solr|statistics|visualize)/.*
+  - ^(.*/)?modules/(archive|dicom.*|javauploaddownload|metadataextractor|pvw|remoteprocessing|solr|statistics|visualize)/.*

core/AppController.php

@@ -267,10 +267,6 @@ public function preDispatch()
 
         // Init Dynamic Help (the order makes sense for the animation)
         if ($this->view->isDynamicHelp) {
-            if ($this->isDemoMode()) {
-                $this->addDynamicHelp('.loginLink', MIDAS_DEMO_DYNAMIC_HELP, 'bottom left', 'top right');
-            }
-
             if ($this->logged) {
                 $this->addDynamicHelp(
                     '#startingGuideLink',
@@ -434,23 +430,6 @@ public function addDynamicHelp($selector, $text, $location = 'bottom right', $ar
         );
     }
 
-    /**
-     * Check if demo mode is set.
-     *
-     * @return bool
-     */
-    public function isDemoMode()
-    {
-        if (in_array('demo', Zend_Registry::get('modulesEnable'))) {
-            /** @var SettingModel $settingModel */
-            $settingModel = MidasLoader::loadModel('Setting');
-
-            return $settingModel->getValueByName('enabled', 'demo');
-        }
-
-        return false;
-    }
-
     /** Disable the layout. */
     public function disableLayout()
     {

core/controllers/AdminController.php

@@ -26,16 +26,6 @@ class AdminController extends AppController
     public $_components = array('Upgrade', 'Utility', 'MIDAS2Migration');
     public $_forms = array('Admin', 'Assetstore', 'Migrate');
 
-    /** init the controller */
-    public function init()
-    {
-        if ($this->isDemoMode()) {
-            $this->disableView();
-
-            return false;
-        }
-    }
-
     /** run a task */
     public function taskAction()
     {

core/controllers/UserController.php

@@ -699,7 +699,7 @@ public function userexistsAction()
     /** Settings page action */
     public function settingsAction()
     {
-        if (!$this->logged || $this->isDemoMode()) {
+        if (!$this->logged) {
             $this->disableView();
 
             return false;

core/views/install/index.phtml

@@ -29,7 +29,6 @@
         <li>Hosts public and private collections of data;</li>
         <li>Handles massive collections and images;</li>
         <li>Manages images, files, and metadata;</li>
-        <li>Integrates BatchMake technology for server-side and standalone batch processing;</li>
         <li>Builds upon open source code and open standards.</li>
     </ul>
     <div class="separator"></div>