@@ -2,6 +2,7 @@ === Edge +* Moved template_name to ApplicationController [Jim Gay, Michael Kessler] * Remove vizres plugin. [Sean Cribbs] * Update instance config/environments to remove ResponseCache [Jim Gay] * Remove :order option from <r:children:count />, which causes errors on CHANGELOG @@ -6,6 +6,7 @@ core: === Edge +* Michael Kessler * Sean Cribbs * David Cato * Kunal Shah CONTRIBUTORS @@ -69,19 +69,6 @@ class Admin::ResourceController < ApplicationController response_for :destroy end - def template_name - case self.action_name - when 'index' - 'index' - when 'new','create' - 'new' - when 'edit', 'update' - 'edit' - when 'remove', 'destroy' - 'remove' - end - end - protected def rescue_action(exception) app/controllers/admin/resource_controller.rb @@ -28,6 +28,19 @@ class ApplicationController < ActionController::Base def include_javascript(script) @javascripts << script end + + def template_name + case self.action_name + when 'index' + 'index' + when 'new','create' + 'new' + when 'edit', 'update' + 'edit' + when 'remove', 'destroy' + 'remove' + end + end def rescue_action_in_public(exception) case exception app/controllers/application_controller.rb @@ -38,4 +38,29 @@ describe ApplicationController do controller.send :set_javascripts_and_stylesheets controller.include_javascript('test').should include('test') end + + describe 'self.template_name' do + it "should return 'index' when the controller action_name is 'index'" do + controller.stub!(:action_name).and_return('index') + controller.template_name.should == 'index' + end + ['new', 'create'].each do |action| + it "should return 'new' when the action_name is #{action}" do + controller.stub!(:action_name).and_return(action) + controller.template_name.should == 'new' + end + end + ['edit', 'update'].each do |action| + it "should return 'edit' when the action_name is #{action}" do + controller.stub!(:action_name).and_return(action) + controller.template_name.should == 'edit' + end + end + ['remove', 'destroy'].each do |action| + it "should return 'remove' when the action_name is #{action}" do + controller.stub!(:action_name).and_return(action) + controller.template_name.should == 'remove' + end + end + end end spec/controllers/application_controller_spec.rb 134c349c118af6cda739d3ed6d3d5efe2d991cfd Jim Gay jim@saturnflyer.com http://github.com/radiant/radiant/commit/322e5c16d21fc599ac339378873ee931ae9d60ef 322e5c16d21fc599ac339378873ee931ae9d60ef 2009-06-12T06:46:49-07:00 2009-06-12T06:46:49-07:00 moved template_name into ApplicationController for controllers that don't inherit from Admin::ResourceController but use UI regions 98749f34d02b3e02b19d0a3c804b6ac546ab111c Jim Gay jim@saturnflyer.com