jro_apps/redmine Commit - r4049:3bc29e29e091

Refactor: split NewsController#new into #new and #create methods....

Eric Davis -

r4049:3bc29e29e091

parent child

Context file:

r4049:3bc29e29e091

app/controllers/news_controller.rb +9 -3

             class NewsController < ApplicationController
               default_search_scope :news
               model_object News
-              before_filter :find_model_object, :except => [:new, :index, :preview]
+              before_filter :find_model_object, :except => [:new, :create, :index, :preview]
-              before_filter :find_project_from_association, :except => [:new, :index, :preview]
+              before_filter :find_project_from_association, :except => [:new, :create, :index, :preview]
-              before_filter :find_project, :only => [:new, :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
               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

app/views/news/index.rhtml +1 -1

             <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) %>

app/views/news/new.rhtml +1 -1

             <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) %>

config/routes.rb +1 -1

                   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

lib/redmine.rb +1 -1

               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

test/functional/news_controller_test.rb +4 -4

                 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'
                 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

test/integration/routing_test.rb +1 -1

                 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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages