X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fapplication_controller.rb;h=0d4ea695caf0f700a415239393438f7b97ba7eba;hb=6cbe57ca7a9cac83fad2f3c66fa097055c1fe803;hp=42e8780635175793491d25b3e87f45335c8143ad;hpb=9529441f04dd2c502077a051b866eac838e5849e;p=pettanr%2Fpettanr.git diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 42e87806..0d4ea695 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -106,7 +106,7 @@ class ApplicationController < ActionController::Base def set_model @my_controller = Manifest.manifest.controllers[params[:controller].to_s] @my_action = @my_controller.actions[params[:action].to_s] - @my_model = Manifest.manifest.models[@my_controller.item_name] + @my_model = Manifest.manifest.models[@my_action.item_name] @my_model_class = @my_model.classify end @@ -165,7 +165,7 @@ class ApplicationController < ActionController::Base def show_prof_format format format.prof { self.formats = [:html] - @profiler = Locmare::Profiler.new @my_model.item_name, @item, @operators + @profiler = Locmare::Profiler.new @my_model_class.item_name, @item, @operators render @profiler.template_name, :locals => { :profiler => @profiler }