kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor: split NewsController#edit into #edit and #update 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4168 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-09-21 15:20:37 +00:00
parent 51359704a0
commit 01d1a02df4
7 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/news_controller.rb
View File

@ -60,14 +60,19 @@ class NewsController < ApplicationController
end
end
end
def edit
if request.post? and @news.update_attributes(params[:news])
flash[:notice] = l(:notice_successful_update)
redirect_to :action => 'show', :id => @news
end
end
def update
if request.put? and @news.update_attributes(params[:news])
flash[:notice] = l(:notice_successful_update)
redirect_to :action => 'show', :id => @news
else
render :action => 'edit'
end
end
def add_comment
@comment = Comment.new(params[:comment])
@comment.author = User.current

4
app/views/news/edit.rhtml
View File

@ -1,7 +1,7 @@
<h2><%=l(:label_news)%></h2>
<% labelled_tabular_form_for :news, @news, :url => { :action => "edit" },
:html => { :id => 'news-form' } do |f| %>
<% labelled_tabular_form_for :news, @news, :url => { :action => "update" },
:html => { :id => 'news-form', :method => :put } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %>
<%= link_to_remote l(:label_preview),

4
app/views/news/show.rhtml
View File

@ -11,8 +11,8 @@
<% if authorize_for('news', 'edit') %>
<div id="edit-news" style="display:none;">
<% labelled_tabular_form_for :news, @news, :url => { :action => "edit", :id => @news },
:html => { :id => 'news-form' } do |f| %>
<% labelled_tabular_form_for :news, @news, :url => { :action => "update", :id => @news },
:html => { :id => 'news-form', :method => :put } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %>
<%= link_to_remote l(:label_preview),

2
config/routes.rb
View File

@ -149,9 +149,9 @@ ActionController::Routing::Routes.draw do |map|
end
news_routes.with_options do |news_actions|
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
news_routes.connect 'news/:id/edit', :action => 'update', :conditions => {:method => :put}
end
map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new'

2
lib/redmine.rb
View File

@ -91,7 +91,7 @@ Redmine::AccessControl.map do |map|
end
map.project_module :news do |map|
map.permission :manage_news, {:news => [:new, :create, :edit, :destroy, :destroy_comment]}, :require => :member
map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy, :destroy_comment]}, :require => :member
map.permission :view_news, {:news => [:index, :show]}, :public => true
map.permission :comment_news, {:news => :add_comment}
end

4
test/functional/news_controller_test.rb
View File

@ -90,9 +90,9 @@ class NewsControllerTest < ActionController::TestCase
assert_template 'edit'
end
def test_post_edit
def test_put_update
@request.session[:user_id] = 2
post :edit, :id => 1, :news => { :description => 'Description changed by test_post_edit' }
put :update, :id => 1, :news => { :description => 'Description changed by test_post_edit' }
assert_redirected_to 'news/1'
news = News.find(1)
assert_equal 'Description changed by test_post_edit', news.description

4
test/integration/routing_test.rb
View File

@ -156,10 +156,12 @@ class RoutingTest < ActionController::IntegrationTest
should_route :get, "/news/2", :controller => 'news', :action => 'show', :id => '2'
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 :get, "/news/567/edit", :controller => 'news', :action => 'edit', :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'
should_route :put, "/news/567/edit", :controller => 'news', :action => 'update', :id => '567'
end
context "projects" do