Merge commit '6a241a81'

* commit '6a241a81':
  Squashed 'Modules/Workshop/' changes from cbf71cf..adc4bf6

Modules/Workshop/Http/Controllers/ModulesController.php

@@ -40,6 +40,7 @@ class ModulesController extends AdminBaseController
                 unset($modules[$module]);
             }
         }
+
         $this->moduleManager->disableModules($enabledModules);
         $this->moduleManager->enableModules($modules);
 

Modules/Workshop/Manager/ModuleManager.php

 <?php namespace Modules\Workshop\Manager;
 
 use Illuminate\Config\Repository as Config;
-use Pingpong\Modules\Module;
 
 class ModuleManager
 {
@@ -15,12 +14,11 @@ class ModuleManager
     private $config;
 
     /**
-     * @param Module $module
      * @param Config $config
      */
-    public function __construct(Module $module, Config $config)
+    public function __construct(Config $config)
     {
-        $this->module = $module;
+        $this->module = app('modules');
         $this->config = $config;
     }
 
@@ -61,9 +59,12 @@ class ModuleManager
     public function getFlippedEnabledModules()
     {
         $enabledModules = $this->module->enabled();
-        $enabledModules = array_flip($enabledModules);
 
-        return $enabledModules;
+        $enabledModules = array_map(function($module) {
+            return $module->getName();
+        }, $enabledModules);
+
+        return array_flip($enabledModules);
     }
 
     /**

Modules/Workshop/Resources/views/admin/modules/index.blade.php

@@ -11,7 +11,7 @@
 @stop
 
 @section('styles')
-<link href="{{{ Module::asset('core', 'css/vendor/iCheck/flat/blue.css') }}}" rel="stylesheet" type="text/css" />
+<link href="{{{ Module::asset('core:css/vendor/iCheck/flat/blue.css') }}}" rel="stylesheet" type="text/css" />
 @stop
 
 @section('content')
@@ -29,7 +29,7 @@
                             <li>
                                 <div class="checkbox">
                                     <label for="{{ $module }}">
-                                        <input id="{{ $module }}" name="modules[{{ $module }}]" type="checkbox" class="flat-blue" <?php echo Module::active($module) ? 'checked' : '' ?> <?php echo isset($coreModules[$module]) ? 'disabled' : ''; ?> value="true" /> {{ $module }}
+                                        <input id="{{ $module }}" name="modules[{{ $module }}]" type="checkbox" class="flat-blue" <?php echo Module::active($module) ? 'checked' : '' ?> <?php echo isset($coreModules[$module->getName()]) ? 'disabled' : ''; ?> value="true" /> {{ $module }}
                                     </label>
                                 </div>
                             </li>

Modules/Workshop/Resources/views/admin/workbench/index.blade.php

@@ -11,7 +11,7 @@
 @stop
 
 @section('styles')
-<link href="{{{ Module::asset('core', 'css/vendor/iCheck/flat/blue.css') }}}" rel="stylesheet" type="text/css" />
+<link href="{{{ Module::asset('core:css/vendor/iCheck/flat/blue.css') }}}" rel="stylesheet" type="text/css" />
 @stop
 
 @section('content')