From 3bc29e29e091b56bcffeb07ffb9c37c328525f99 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 20 Sep 2010 15:13:48 +0000
Subject: [PATCH] Refactor: split NewsController#new into #new and #create
 methods.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4163 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/news_controller.rb      | 12 +++++++++---
 app/views/news/index.rhtml              |  2 +-
 app/views/news/new.rhtml                |  2 +-
 config/routes.rb                        |  2 +-
 lib/redmine.rb                          |  2 +-
 test/functional/news_controller_test.rb |  8 ++++----
 test/integration/routing_test.rb        |  2 +-
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 4d44158a4a0..f4e4b6559f3 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -18,9 +18,9 @@
 class NewsController < ApplicationController
   default_search_scope :news
   model_object News
-  before_filter :find_model_object, :except => [:new, :index, :preview]
-  before_filter :find_project_from_association, :except => [:new, :index, :preview]
-  before_filter :find_project, :only => [:new, :preview]
+  before_filter :find_model_object, :except => [:new, :create, :index, :preview]
+  before_filter :find_project_from_association, :except => [:new, :create, :index, :preview]
+  before_filter :find_project, :only => [:new, :create, :preview]
   before_filter :authorize, :except => [:index, :preview]
   before_filter :find_optional_project, :only => :index
   accept_key_auth :index
@@ -46,11 +46,17 @@ def show
 
   def new
     @news = News.new(:project => @project, :author => User.current)
+  end
+
+  def create
+    @news = News.new(:project => @project, :author => User.current)
     if request.post?
       @news.attributes = params[:news]
       if @news.save
         flash[:notice] = l(:notice_successful_create)
         redirect_to :controller => 'news', :action => 'index', :project_id => @project
+      else
+        render :action => 'new'
       end
     end
   end
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 41e8bb355bf..2b53b7f72a3 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -7,7 +7,7 @@
 
 <div id="add-news" style="display:none;">
 <h2><%=l(:label_news_new)%></h2>
-<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
+<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'create', :project_id => @project },
                                            :html => { :id => 'news-form' } do |f| %>
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
diff --git a/app/views/news/new.rhtml b/app/views/news/new.rhtml
index a4d29a0a9f6..74ae64ae87b 100644
--- a/app/views/news/new.rhtml
+++ b/app/views/news/new.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_news_new)%></h2>
 
-<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
+<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'create', :project_id => @project },
                                            :html => { :id => 'news-form' } do |f| %>
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
diff --git a/config/routes.rb b/config/routes.rb
index 062bb586e61..ceaaf6219ee 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -148,7 +148,7 @@
       news_views.connect 'news/:id/edit', :action => 'edit'
     end
     news_routes.with_options do |news_actions|
-      news_actions.connect 'projects/:project_id/news', :action => 'new'
+      news_actions.connect 'projects/:project_id/news', :action => 'create', :conditions => {:method => :post}
       news_actions.connect 'news/:id/edit', :action => 'edit'
       news_actions.connect 'news/:id/destroy', :action => 'destroy'
     end
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 8acae48a8e4..946701a8dda 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -91,7 +91,7 @@
   end
   
   map.project_module :news do |map|
-    map.permission :manage_news, {:news => [:new, :edit, :destroy, :destroy_comment]}, :require => :member
+    map.permission :manage_news, {:news => [:new, :create, :edit, :destroy, :destroy_comment]}, :require => :member
     map.permission :view_news, {:news => [:index, :show]}, :public => true
     map.permission :comment_news, {:news => :add_comment}
   end
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 3abb9a7fb43..dd782fa3b9b 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -65,12 +65,12 @@ def test_get_new
     assert_template 'new'
   end
   
-  def test_post_new
+  def test_post_create
     ActionMailer::Base.deliveries.clear
     Setting.notified_events << 'news_added'
 
     @request.session[:user_id] = 2
-    post :new, :project_id => 1, :news => { :title => 'NewsControllerTest',
+    post :create, :project_id => 1, :news => { :title => 'NewsControllerTest',
                                             :description => 'This is the description',
                                             :summary => '' }
     assert_redirected_to 'projects/ecookbook/news'
@@ -98,9 +98,9 @@ def test_post_edit
     assert_equal 'Description changed by test_post_edit', news.description
   end
 
-  def test_post_new_with_validation_failure
+  def test_post_create_with_validation_failure
     @request.session[:user_id] = 2
-    post :new, :project_id => 1, :news => { :title => '',
+    post :create, :project_id => 1, :news => { :title => '',
                                             :description => 'This is the description',
                                             :summary => '' }
     assert_response :success
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 794a7780ef8..1fc3f82d467 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -157,7 +157,7 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :get, "/projects/567/news/new", :controller => 'news', :action => 'new', :project_id => '567'
     should_route :get, "/news/234", :controller => 'news', :action => 'show', :id => '234'
 
-    should_route :post, "/projects/567/news/new", :controller => 'news', :action => 'new', :project_id => '567'
+    should_route :post, "/projects/567/news", :controller => 'news', :action => 'create', :project_id => '567'
     should_route :post, "/news/567/edit", :controller => 'news', :action => 'edit', :id => '567'
     should_route :post, "/news/567/destroy", :controller => 'news', :action => 'destroy', :id => '567'
   end