@@ -3,11 +3,12 @@ module Admin self._layout = 'admin' def edit - @setting = Setting.load + @setting = Setting.instance render end def update(setting) + debugger @setting = Setting.new({"settings" => setting}) @setting.save redirect url(:edit_settings) app/controllers/admin/settings.rb @@ -1,4 +1,4 @@ -<% form_for(:setting, :action => url(:admin_settings,@setting), :method => :put) do |f| %> +<% form_for(:setting, :action => url(:update_settings), :method => :put) do |f| %> <fieldset> <legend>Blerb Settings</legend> <%= text_control :title, :label => "Blog Title", :class => "title" %> app/views/admin/settings/edit.html.erb @@ -16,7 +16,7 @@ Merb::Router.prepare do |r| end admin.to(:controller => "settings") do |admin_settings| - admin_settings.match('/settings', :method => :post).to(:action => 'update').name(:update_settings) + admin_settings.match('/settings', :method => :put).to(:action => 'update').name(:update_settings) admin_settings.match('/settings').to(:action => 'edit').name(:edit_settings) end config/router.rb @@ -14,7 +14,7 @@ describe "The settings named routes" do request_to("/admin/settings", :get).should route_to(Admin::Settings, :edit) end - it "should route POST '/admin/settings to Admin::Settings#update" do - request_to("/admin/settings", :post).should route_to(Admin::Settings, :update) + it "should route PUT '/admin/settings to Admin::Settings#update" do + request_to("/admin/settings", :put).should route_to(Admin::Settings, :update) end end \ No newline at end of file spec/routes/settings_routes_spec.rb 7bb2cd76e8f68ef8c9f37141a84c8d56462eb2bf Ben Burkert ben@benburkert.com http://github.com/hornbeck/blerb-core/commit/e99089e40a93cc1f7612d607515c38481bafd339 e99089e40a93cc1f7612d607515c38481bafd339 2008-02-26T21:39:09-08:00 2008-02-26T21:39:09-08:00 fixed settings controller stuff 5f81a4320e00c4b87fb592334b3302ee1c2dccf0 Ben Burkert ben@benburkert.com