jro_apps/redmine Commit - r1097:1ecef3a95ae0

ProjectsController#add_news moved to NewsController#new....

Jean-Philippe Lang -

r1097:1ecef3a95ae0

parent child

Context file:

r1097:1ecef3a95ae0

Collapse all files

app/views/news/new.rhtml created 644 +14 0

@@ -0,0 +1,14
	1	<h2><%=l(:label_news_new)%></h2>
	2
	3	<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
	4	:html => { :id => 'news-form' } do \|f\| %>
	5	<%= render :partial => 'news/form', :locals => { :f => f } %>
	6	<%= submit_tag l(:button_create) %>
	7	<%= link_to_remote l(:label_preview),
	8	{ :url => { :controller => 'news', :action => 'preview' },
	9	:method => 'post',
	10	:update => 'preview',
	11	:with => "Form.serialize('news-form')"
	12	}, :accesskey => accesskey(:preview) %>
	13	<% end %>
	14	<div id="preview" class="wiki"></div>

app/controllers/news_controller.rb +27 -2

             class NewsController < ApplicationController
               layout 'base'
-              before_filter :find_project, :authorize, :except => :index
+              before_filter :find_news, :except => [:new, :index, :preview]
+              before_filter :find_project, :only => :new
+              before_filter :authorize, :except => [:index, :preview]
               before_filter :find_optional_project, :only => :index
               accept_key_auth :index
               def show
               end
+              def new
+                @news = News.new(:project => @project, :author => User.current)
+                if request.post?
+                  @news.attributes = params[:news]
+                  if @news.save
+                    flash[:notice] = l(:notice_successful_create)
+                    Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
+                    redirect_to :controller => 'news', :action => 'index', :project_id => @project
+                  end
+                end
+              end
               def edit
                 if request.post? and @news.update_attributes(params[:news])
                   flash[:notice] = l(:notice_successful_update)
                 redirect_to :action => 'index', :project_id => @project
               end
+              def preview
+                @text = (params[:news] ? params[:news][:description] : nil)
+                render :partial => 'common/preview'
+              end
             private
-              def find_project
+              def find_news
                 @news = News.find(params[:id])
                 @project = @news.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
+              def find_project
+                @project = Project.find(params[:project_id])
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
               def find_optional_project
                 return true unless params[:project_id]
                 @project = Project.find(params[:project_id])

app/controllers/projects_controller.rb 0 -13

@@ -259,19 +259,6 class ProjectsController < ApplicationController
259	render :layout => false if request.xhr?	259	render :layout => false if request.xhr?
260	end	260	end
261		261
262	# Add a news to @project
263	def add_news
264	@news = News.new(:project => @project, :author => User.current)
265	if request.post?
266	@news.attributes = params[:news]
267	if @news.save
268	flash[:notice] = l(:notice_successful_create)
269	Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
270	redirect_to :controller => 'news', :action => 'index', :project_id => @project
271	end
272	end
273	end
274
275	def add_file	262	def add_file
276	if request.post?	263	if request.post?
277	@version = @project.versions.find_by_id(params[:version_id])	264	@version = @project.versions.find_by_id(params[:version_id])

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

@@ -1,6 +1,14
1	<h2><%=l(:label_news)%></h2>	1	<h2><%=l(:label_news)%></h2>
2		2
3	<% labelled_tabular_form_for :news, @news, :url => { :action => "edit" } do \|f\| %>	3	<% labelled_tabular_form_for :news, @news, :url => { :action => "edit" },
		4	:html => { :id => 'news-form' } do \|f\| %>
4	<%= render :partial => 'form', :locals => { :f => f } %>	5	<%= render :partial => 'form', :locals => { :f => f } %>
5	<%= submit_tag l(:button_save) %>	6	<%= submit_tag l(:button_save) %>
6	<% end %> No newline at end of file	7	<%= link_to_remote l(:label_preview),
		8	{ :url => { :controller => 'news', :action => 'preview' },
		9	:method => 'post',
		10	:update => 'preview',
		11	:with => "Form.serialize('news-form')"
		12	}, :accesskey => accesskey(:preview) %>
		13	<% end %>
		14	<div id="preview" class="wiki"></div>

app/views/news/index.rhtml +10 -2

             <div class="contextual">
             <%= link_to_if_authorized(l(:label_news_new),
-                                      {:controller => 'projects', :action => 'add_news', :id => @project},
+                                      {:controller => 'news', :action => 'new', :project_id => @project},
                                       :class => 'icon icon-add',
                                       :onclick => 'Element.show("add-news"); 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 => 'projects', :action => "add_news", :id => @project } do |f| %>
+            <% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @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 => 'news', :action => 'preview' },
+                                 :method => 'post',
+                                 :update => 'preview',
+                                 :with => "Form.serialize('news-form')"
+                               }, :accesskey => accesskey(:preview) %> |
             <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
             <% end if @project %>
+            <div id="preview" class="wiki"></div>
             </div>
             <h2><%=l(:label_news_plural)%></h2>

app/views/news/show.rhtml +9 -1

             <h2><%=h @news.title %></h2>
             <div id="edit-news" style="display:none;">
-            <% labelled_tabular_form_for :news, @news, :url => { :action => "edit", :id => @news } do |f| %>
+            <% labelled_tabular_form_for :news, @news, :url => { :action => "edit", :id => @news },
+                                                       :html => { :id => 'news-form' } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
+            <%= link_to_remote l(:label_preview),
+                               { :url => { :controller => 'news', :action => 'preview' },
+                                 :method => 'post',
+                                 :update => 'preview',
+                                 :with => "Form.serialize('news-form')"
+                               }, :accesskey => accesskey(:preview) %> |
             <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news")' %>
             <% end %>
+            <div id="preview" class="wiki"></div>
             </div>
             <p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %>

lib/redmine.rb +1 -1

               end
               map.project_module :news do |map|
-                map.permission :manage_news, {:projects => :add_news, :news => [:edit, :destroy, :destroy_comment]}, :require => :member
+                map.permission :manage_news, {:news => [:new, :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 +11 0

@@ -45,4 +45,15 class NewsControllerTest < Test::Unit::TestCase
45	assert_template 'index'	45	assert_template 'index'
46	assert_not_nil assigns(:newss)	46	assert_not_nil assigns(:newss)
47	end	47	end
		48
		49	def test_preview
		50	get :preview, :project_id => 1,
		51	:news => {:title => '',
		52	:description => 'News description',
		53	:summary => ''}
		54	assert_response :success
		55	assert_template 'common/_preview'
		56	assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
		57	:content => /News description/
		58	end
48	end	59	end

app/views/projects/add_news.rhtml removed 0 -6

NO CONTENT: file was removed

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