sidebar rewrited

lib/orbit_app/module/registration.rb

@@ -39,8 +39,12 @@ module OrbitApp
             setup_module_app
           end
 
+          def get_module_app
+            ModuleApp.first(conditions: {:key=>@key,:title=>name})
+          end
+
           def setup_module_app
-            module_app = ModuleApp.first(conditions: {:key=>@key,:title=>name})
+            module_app = get_module_app
             module_app = ModuleApp.new(:key=>@key,:title=>name) if module_app.nil?
 
             begin
@@ -90,7 +94,7 @@ module OrbitApp
           end
 
           def side_bar(&block)
-            @side_bar = SideBarRegisition::SideBar.new(@name,@key,&block)
+            @side_bar = SideBarRegisition::SideBar.new(@name,@key,method(:get_module_app),&block)
           end
 
           def personal_plugin(params)

lib/orbit_app/module/side_bar.rb

@@ -17,6 +17,10 @@ module OrbitApp
             return nil
           end
 
+          def render_all(request,params,user,current_module_app)
+            @@side_bars.collect{|t| t.render(request,params,user,current_module_app)}.join.html_safe
+          end
+
           def all
             return @@side_bars
           end
@@ -37,7 +41,7 @@ module OrbitApp
           # def is_manager?
           #   binding.pry
           # end
-          def initialize(name = '',key,&block)            
+          def initialize(name = '',key,get_module_app,&block)     
             @head_label = name
             @context_links = []
             @available_for = []
@@ -47,12 +51,16 @@ module OrbitApp
             @head_link = ""
             @app_base_path = ''
             @module_app_key = key
+            @get_module_app = get_module_app
             block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
             # setup_module_app(module_app_key)
             finalize!
             SideBarRegisition.add(self)
           end
           
+          def get_module_app
+            @get_module_app.call
+          end
 
           def head_label_i18n(var,options ={})
             @head_label = var
@@ -76,7 +84,7 @@ module OrbitApp
           end
 
           def context_link(*var)
-            var[1].merge!(:module_app_key=>@module_app_key) unless @module_app_key.nil?
+            var[1].merge!({:module_app_key=>@module_app_key,:get_module_app=>@get_module_app}) unless @module_app_key.nil?
             new_context_link = ContextLink.new(*var)
             @context_links << new_context_link
           end
@@ -126,6 +134,11 @@ module OrbitApp
             @active_for_object_auth = options[:active_for_object_auth] || []
             @active_for_app_auth = options[:active_for_app_auth] || []
             @module_app_key = options[:module_app_key]
+            @get_module_app = options[:get_module_app]
+          end
+
+          def get_module_app
+            @get_module_app.call
           end
 
           def active?