app/views/admin/preferences/edit.html.haml @@ -1,11 +1,21 @@ class Admin::PreferencesController < AdminController + def create + update + end + + def show + edit + render :action => "edit" + end + def edit - @preferences = Preference.all + @preferences = Preference.all.to_key_and_value_pair end def update - @preferences = Preference.update_many(params[:preferences]) + Preference.update_many(params[:preferences]) + @preferences = Preference.all.to_key_and_value_pair flash[:success] = "Preferences have been updated" - redirect_to edit_admin_preferences_path + render :action => "edit" end end app/controllers/admin/preferences_controller.rb @@ -1,6 +1,7 @@ class ApplicationController < ActionController::Base include AuthenticatedSystem include DateTimeExtensions + include ArrayExtensions helper :all # include all helpers, all the time app/controllers/application.rb @@ -150,3 +150,6 @@ textarea { font-weight: bold; text-align: right; color: #e5d9d9; } + +label { + font-weight: bold; } public/stylesheets/admin.css @@ -169,3 +169,6 @@ textarea font-weight: bold text-align: right color: #e5d9d9 + +label + font-weight: bold \ No newline at end of file public/stylesheets/sass/admin.sass @@ -21,13 +21,14 @@ describe Admin::PreferencesController do end end - describe "edit action" do + describe "update action" do it "should succesfully complete the action" do Preference.should_receive(:update_many).once.and_return(true) put :update, :preferences => { :name => "simple", :theme => "fuschia" } - assigns(:preferences).should_not be_nil - response.should be_redirect + assigns(:preferences).should_not be_empty + response.should be_success end end + end end spec/controllers/admin/preferences_controller_spec.rb @@ -36,4 +36,11 @@ describe Preference do end.should change { Preference.get("theme", true) } end end + + describe "#to_key_and_value_pair" do + it "should grab preferences and return key and pair value" do + preferences = Preference.all.to_key_and_value_pair + preferences.should include([preferences(:theme).name, preferences(:theme).value]) + end + end end \ No newline at end of file spec/models/preference_spec.rb app/views/admin/preferences/index.html.haml cba812f95c2a262c88e563e1ee229d3af62e3491 Zach Inglis zach@lt3media.com http://github.com/zachinglis/mouth/commit/92696cc6bd5c1dbb6c5b6e97e16bd610af7a2ab0 92696cc6bd5c1dbb6c5b6e97e16bd610af7a2ab0 2008-08-09T18:35:06-07:00 2008-08-09T18:35:06-07:00 Preferences are fully working now 96cdadcd2b6e1b791cbdbcb88b01c5a50867fe95 Zach Inglis zach@lt3media.com