jro_apps/redmine Commit - r4100:79e30e7087d7

Refactor: convert News to a REST resource...

Eric Davis -

r4100:79e30e7087d7

parent child

Context file:

r4100:79e30e7087d7

Collapse all files

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

             <p><%= link_to_project(news.project) + ': ' unless @project %>
-            <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
+            <%= link_to h(news.title), news_path(news) %>
             <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
             <br />
             <% unless news.summary.blank? %><span class="summary"><%=h news.summary %></span><br /><% end %>

app/views/news/edit.rhtml +2 -2

             <h2><%=l(:label_news)%></h2>
-            <% labelled_tabular_form_for :news, @news, :url => { :action => "update" },
+            <% labelled_tabular_form_for :news, @news, :url => news_path(@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),
-                               { :url => { :controller => 'previews', :action => 'news', :project_id => @project },
+                               { :url => preview_news_path(:project_id => @project),
                                  :method => 'get',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"

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

             <div class="contextual">
             <%= link_to_if_authorized(l(:label_news_new),
-                                      {:controller => 'news', :action => 'new', :project_id => @project},
+                                      new_project_news_path(@project),
                                       :class => 'icon icon-add',
                                       :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project %>
             </div>
             <div id="add-news" style="display:none;">
             <h2><%=l(:label_news_new)%></h2>
-            <% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'create', :project_id => @project },
+            <% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
                                                        :html => { :id => 'news-form' } do |f| %>
             <%= render :partial => 'news/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <%= link_to_remote l(:label_preview),
-                               { :url => { :controller => 'previews', :action => 'news', :project_id => @project },
+                               { :url => preview_news_path(:project_id => @project),
                                  :method => 'get',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
             <% else %>
             <% @newss.each do |news| %>
                 <h3><%= link_to_project(news.project) + ': ' unless news.project == @project %>
-                <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
+                <%= link_to h(news.title), news_path(news) %>
                 <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
                 <p class="author"><%= authoring news.created_on, news.author %></p>
                 <div class="wiki">

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

             <h2><%=l(:label_news_new)%></h2>
-            <% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'create', :project_id => @project },
+            <% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
                                                        :html => { :id => 'news-form' } do |f| %>
             <%= render :partial => 'news/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <%= link_to_remote l(:label_preview),
-                               { :url => { :controller => 'previews', :action => 'news', :project_id => @project },
+                               { :url => preview_news_path(:project_id => @project),
                                  :method => 'get',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"

app/views/news/show.rhtml +4 -4

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit),
-                                      {:controller => 'news', :action => 'edit', :id => @news},
+                                      edit_news_path(@news),
                                       :class => 'icon icon-edit',
                                       :accesskey => accesskey(:edit),
                                       :onclick => 'Element.show("edit-news"); return false;' %>
-            <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+            <%= link_to_if_authorized l(:button_delete), news_path(@news), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
             </div>
             <h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
             <% if authorize_for('news', 'edit') %>
             <div id="edit-news" style="display:none;">
-            <% labelled_tabular_form_for :news, @news, :url => { :action => "update", :id => @news },
+            <% labelled_tabular_form_for :news, @news, :url => news_path(@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),
-                               { :url => { :controller => 'previews', :action => 'news', :project_id => @project },
+                               { :url => preview_news_path(:project_id => @project),
                                  :method => 'get',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"

config/routes.rb +7 -23

@@ -136,30 +136,7 ActionController::Routing::Routes.draw do \|map\|
136	relations.connect 'issues/:issue_id/relations/:id', :action => 'new'	136	relations.connect 'issues/:issue_id/relations/:id', :action => 'new'
137	relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'	137	relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'
138	end	138	end
139
140	map.with_options :controller => 'news' do \|news_routes\|
141	news_routes.connect 'news/:id/preview', :controller => 'previews', :action => 'news'
142	news_routes.connect 'news/preview', :controller => 'previews', :action => 'news'
143
144	news_routes.with_options :conditions => {:method => :get} do \|news_views\|
145	news_views.connect 'news', :action => 'index'
146	news_views.connect 'projects/:project_id/news', :action => 'index'
147	news_views.connect 'projects/:project_id/news.:format', :action => 'index'
148	news_views.connect 'news.:format', :action => 'index'
149	news_views.connect 'projects/:project_id/news/new', :action => 'new'
150	news_views.connect 'news/:id', :action => 'show'
151	news_views.connect 'news/:id/edit', :action => 'edit'
152	end
153	news_routes.with_options do \|news_actions\|
154	news_actions.connect 'projects/:project_id/news', :action => 'create', :conditions => {:method => :post}
155	news_actions.connect 'news/:id/destroy', :action => 'destroy'
156	end
157	news_routes.connect 'news/:id/edit', :action => 'update', :conditions => {:method => :put}
158		139
159	news_routes.connect 'news/:id/comments', :controller => 'comments', :action => 'create', :conditions => {:method => :post}
160	news_routes.connect 'news/:id/comments/:comment_id', :controller => 'comments', :action => 'destroy', :conditions => {:method => :delete}
161	end
162
163	map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new'	140	map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new'
164		141
165	map.with_options :controller => 'users' do \|users\|	142	map.with_options :controller => 'users' do \|users\|
@@ -182,6 +159,12 ActionController::Routing::Routes.draw do \|map\|
182	# For nice "roadmap" in the url for the index action	159	# For nice "roadmap" in the url for the index action
183	map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'	160	map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'
184		161
		162	map.all_news 'news', :controller => 'news', :action => 'index'
		163	map.formatted_all_news 'news.:format', :controller => 'news', :action => 'index'
		164	map.preview_news '/news/preview', :controller => 'previews', :action => 'news'
		165	map.connect 'news/:id/comments', :controller => 'comments', :action => 'create', :conditions => {:method => :post}
		166	map.connect 'news/:id/comments/:comment_id', :controller => 'comments', :action => 'destroy', :conditions => {:method => :delete}
		167
185	map.resources :projects, :member => {	168	map.resources :projects, :member => {
186	:copy => [:get, :post],	169	:copy => [:get, :post],
187	:settings => :get,	170	:settings => :get,
@@ -192,6 +175,7 ActionController::Routing::Routes.draw do \|map\|
192	project.resource :project_enumerations, :as => 'enumerations', :only => [:update, :destroy]	175	project.resource :project_enumerations, :as => 'enumerations', :only => [:update, :destroy]
193	project.resources :files, :only => [:index, :new, :create]	176	project.resources :files, :only => [:index, :new, :create]
194	project.resources :versions, :collection => {:close_completed => :put}, :member => {:status_by => :post}	177	project.resources :versions, :collection => {:close_completed => :put}, :member => {:status_by => :post}
		178	project.resources :news, :shallow => true
195	end	179	end
196		180
197	# Destroy uses a get request to prompt the user before the actual DELETE request	181	# Destroy uses a get request to prompt the user before the actual DELETE request

test/functional/news_controller_test.rb +1 -1

               def test_destroy
                 @request.session[:user_id] = 2
-                post :destroy, :id => 1
+                delete :destroy, :id => 1
                 assert_redirected_to 'projects/ecookbook/news'
                 assert_nil News.find_by_id(1)
               end

test/integration/routing_test.rb +2 -5

                 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 :get, "/news/123/preview", :controller => 'previews', :action => 'news', :id => '123'
                 should_route :get, "/news/preview", :controller => 'previews', :action => 'news'
                 should_route :post, "/projects/567/news", :controller => 'news', :action => 'create', :project_id => '567'
-                should_route :post, "/news/567/destroy", :controller => 'news', :action => 'destroy', :id => '567'
                 should_route :post, "/news/567/comments", :controller => 'comments', :action => 'create', :id => '567'
-                should_route :post, "/issues/preview/123", :controller => 'previews', :action => 'issue', :id => '123'
+                should_route :put, "/news/567", :controller => 'news', :action => 'update', :id => '567'
-                should_route :put, "/news/567/edit", :controller => 'news', :action => 'update', :id => '567'
+                should_route :delete, "/news/567", :controller => 'news', :action => 'destroy', :id => '567'
                 should_route :delete, "/news/567/comments/15", :controller => 'comments', :action => 'destroy', :id => '567', :comment_id => '15'
               end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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