Merge pull request #3438 from timoschilling/cleanup_application_names…

…pace cleanup ActiveAdmin::Application#namespace
activeadmin · Sep 14, 2014 · 4e43ae2 · 4e43ae2
2 parents 7dbf854 + dc9e542
commit 4e43ae2
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/active_admin/application.rb b/lib/active_admin/application.rb
@@ -128,11 +128,10 @@ def register(resource, options = {}, &block)
     def namespace(name)
       name ||= :root
 
-      if namespaces[name]
-        namespace = namespaces[name]
-      else
-        namespace = namespaces[name] = Namespace.new(self, name)
+      namespace = namespaces[name] ||= begin
+        namespace = Namespace.new(self, name)
         ActiveAdmin::Event.dispatch ActiveAdmin::Namespace::RegisterEvent, namespace
+        namespace
       end
 
       yield(namespace) if block_given?