cleanup

Hesham E committed Aug 18, 2010

commit df1d9af0de8088957cd4f2f5a6f9fdac6c03d271

app/controllers/cms_admin/base_controller.rb +1 -1

@@	@@ -1,4 +1,4 @@
	class CmsAdmin::BaseController < ApplicationController
	layout 'cms_admin'
-
+
	end

app/controllers/cms_admin/pages_controller.rb +3 -0

@@	@@ -1,2 +1,5 @@
	class CmsAdmin::PagesController < CmsAdmin::BaseController
+
+	def index
+	end
	end

app/controllers/cms_admin/snippets_controller.rb +3 -3

@@	@@ -18,21 +18,21 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController

	def create
	@cms_snippet.save!
-	redirect_to [:cms_admin, :snippets], :notice => 'Snippet created'
+	redirect_to({ :action => :edit, :id => @cms_snippet }, :notice => 'Snippet created')
	rescue ActiveRecord::RecordInvalid
	render :action => :new
	end

	def update
	@cms_snippet.update_attributes!(params[:cms_snippet])
-	redirect_to [:cms_admin, :snippets], :notice => 'Snippet updated'
+	redirect_to({ :action => :edit, :id => @cms_snippet }, :notice => 'Snippet updated')
	rescue ActiveRecord::RecordInvalid
	render :action => :edit
	end

	def destroy
	@cms_snippet.destroy
-	redirect_to [:cms_admin, :snippets], :notice => 'Snippet removed'
+	redirect_to({ :action => :index }, :notice => 'Snippet removed')
	end

	protected

app/views/cms_admin/pages/_form.html.haml +0 -0

app/views/cms_admin/pages/edit.html.haml +0 -0

app/views/cms_admin/pages/index.html.haml +0 -0

app/views/cms_admin/pages/new.html.haml +0 -0

config/routes.rb +1 -0

@@	@@ -1,6 +1,7 @@
	ComfortableMexicanSofa::Application.routes.draw do

	namespace :cms_admin, :path => 'cms-admin' do
+	match '/', :to => redirect('/cms-admin/pages')
	resources :layouts, :pages, :snippets, :assets
	end

test/functional/cms_admin/snippets_controller_test.rb +3 -3

@@	@@ -20,7 +20,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
	def test_create
	assert_difference 'CmsSnippet.count' do
	post :create, :cms_snippet => cms_snippet_params
-	assert_redirected_to [:cms_admin, :snippets]
+	assert_redirected_to edit_cms_admin_snippet_path(assigns(:cms_snippet))
	assert_equal 'Snippet created', flash[:notice]
	end
	end
@@	@@ -38,7 +38,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
	:label => 'new_test_label',
	:content => 'new test content'
	}
-	assert_redirected_to [:cms_admin, :snippets]
+	assert_redirected_to edit_cms_admin_snippet_path(snippet)
	assert_equal 'Snippet updated', flash[:notice]

	snippet.reload
@@	@@ -49,7 +49,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
	def test_destroy
	assert_difference 'CmsSnippet.count', -1 do
	delete :destroy, :id => cms_snippets(:default)
-	assert_redirected_to [:cms_admin, :snippets]
+	assert_redirected_to cms_admin_snippets_path
	assert_equal 'Snippet removed', flash[:notice]
	end
	end