Small fixes after multinode rebase

cubesystems · Jan 30, 2016 · 42a2d96 · 42a2d96
1 parent 71dfb03
commit 42a2d96
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 57 deletions.
diff --git a/releaf-content/spec/lib/releaf/content/configuration_spec.rb b/releaf-content/spec/lib/releaf/content/configuration_spec.rb
@@ -188,4 +188,4 @@ def stub_config config
   end
 
 
-end
+end
diff --git a/releaf-core/lib/generators/dummy/templates/initializers/releaf.rb b/releaf-core/lib/generators/dummy/templates/initializers/releaf.rb
@@ -4,7 +4,7 @@
   ### setup menu items and therefore available controllers
   config.menu = [
     {
-      controller: 'releaf/content/nodes',
+      controller: 'admin/nodes',
     },
     {
       name: "inventory",

diff --git a/releaf-core/lib/releaf/core/configuration.rb b/releaf-core/lib/releaf/core/configuration.rb
@@ -93,7 +93,6 @@ def self.default_values
         menu: [],
         additional_controllers: [],
         controllers: {},
-        components: [],
         assets_resolver_class_name:  'Releaf::Core::AssetsResolver',
         layout_builder_class_name: 'Releaf::Builders::Page::LayoutBuilder',
         content_resources: { 'Node' => { controller: 'Releaf::Content::NodesController' } }

diff --git a/releaf-core/lib/releaf/core/exceptions.rb b/releaf-core/lib/releaf/core/exceptions.rb
@@ -1,4 +1,4 @@
 module Releaf::Core
-  class AccessDenied < StandardError
-  end
+  class Error < StandardError; end
+  class AccessDenied < Error; end
 end
diff --git a/releaf-permissions/spec/controllers/permissions/home_controller_spec.rb b/releaf-permissions/spec/controllers/permissions/home_controller_spec.rb