.gitignore @@ -1,9 +1,9 @@ class Admin::SettingsController < ApplicationController - only_allow_access_to :new, :create, :destroy + only_allow_access_to :new, :create, :destroy, :when => :admin, :denied_url => {:action => 'index'}, - :denied_message => "See your administrator if you'd like to create a new setting." + :denied_message => "See your administrator if you'd like to create a new setting or delete an existing one." def index @settings = Radiant::Config.find_all_as_tree @@ -13,7 +13,9 @@ class Admin::SettingsController < ApplicationController end def create - Radiant::Config.find_or_create_by_key(params[:setting]['key']).update_attributes(params[:setting]) + @setting = Radiant::Config.find_or_create_by_key(params[:setting]['key']) + @setting.update_attributes(params[:setting]) + flash[:notice] = "The setting \"#{@setting.key}\" was created." redirect_to admin_settings_url end @@ -26,4 +28,12 @@ class Admin::SettingsController < ApplicationController redirect_to admin_settings_url end + def destroy + @setting = Radiant::Config.find(params[:id]) + @key = @setting.key + @setting.destroy + flash[:notice] = "The setting \"#{@key}\" was deleted." + redirect_to admin_settings_url + end + end app/controllers/admin/settings_controller.rb @@ -14,14 +14,11 @@ p margin: 0 0 10px -%h1 - Edit Radiant Setting +%h1 Edit Radiant Setting - %h2.setting-name - = @setting.key - - .description - = textilize @setting.description +%h2.setting-name= @setting.key + +.description= textilize @setting.description - form_for :setting, :url => admin_setting_path(@setting), :html => { :method => :put } do |f| .form-area @@ -32,5 +29,9 @@ %br/ - %p.buttons - = submit_tag 'Save', :class => 'button' \ No newline at end of file + %p.buttons= submit_tag 'Save', :class => 'button' + +%p.buttons + - if admin? + This system relies on some of these settings to work properly. Deleting settings may cause unexpected errors. + = link_to "I understand. Delete this setting entirely.", admin_setting_path(@setting), :method => :delete if admin? \ No newline at end of file app/views/admin/settings/edit.html.haml @@ -1,6 +1,6 @@ - content_for 'page_css' do :sass - table.index + table#settings_index span.label color: #666 font-size: 1.2em @@ -14,14 +14,25 @@ td background: #EAEAEA height: 3px - padding: 0 !important + padding: 0 + p.new + a + color: #000 + border: 1px solid #ddf + padding: 6px + text-decoration: none + &:hover + background: #efefff + %h1 Radiant Settings -%table.index +%table#settings_index.index %tr %th.key Setting Name %th.value Value - @settings.each do |key, node| - = render_node key, node, :reset_depth => true \ No newline at end of file + = render_node key, node, :reset_depth => true + +%p.new= link_to "New Setting", new_admin_setting_url if admin? \ No newline at end of file app/views/admin/settings/index.html.haml @@ -35,4 +35,4 @@ %br/ %p.buttons - = submit_tag 'Save', :class => 'button' \ No newline at end of file + = submit_tag 'Create', :class => 'button' \ No newline at end of file app/views/admin/settings/new.html.haml @@ -37,6 +37,14 @@ describe Admin::SettingsController do end end + describe "GET /admin/settings/new" do + it "should show a new setting form" do + login_as :admin + get 'new' + response.should be_success + end + end + describe "GET /admin/settings/:id/edit" do it "should fetch the desired setting" do Radiant::Config.should_receive(:find).with('123').and_return(@parts) @@ -56,4 +64,15 @@ describe Admin::SettingsController do end end + describe "DELETE /admin/setting/:id" do + it "should destroy the desired setting" do + login_as :admin + Radiant::Config.should_receive(:find).with('123').and_return(@parts) + @parts.should_receive(:destroy) + + delete 'destroy', :id => '123' + response.should redirect_to(admin_settings_path) + end + end + end spec/controllers/admin/settings_controller_spec.rb @@ -2,10 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe Admin::SettingsHelper do - #Delete this example and add some real ones or delete this file - it "should include the Admin::SettingsHelper" do - included_modules = self.metaclass.send :included_modules - included_modules.should include(Admin::SettingsHelper) + describe "render_node" do + it "should set the depth to 0 if it is not explicitly set" + + it "should render the 'setting' partial" + end end spec/helpers/admin/settings_helper_spec.rb b3cd6effc76ecb12718ee5ca992e3d711c2d9c56 Jim Gay jim@saturnflyer.com http://github.com/Squeegy/radiant-settings/commit/b1058dab910fa31e1bcfbaf063f4587c5c668251 b1058dab910fa31e1bcfbaf063f4587c5c668251 2008-06-25T18:56:08-07:00 2008-06-25T18:56:08-07:00 spec'd destroy and new, pending specs for helper a189dec553cd0b77d6ee4c55460e23762f73fa85 Jim Gay jim@saturnflyer.com