| @@ -1,109 +1,112 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2011 Jean-Philippe Lang |
|
|
3 | 3 | # |
|
|
4 | 4 | # This program is free software; you can redistribute it and/or |
|
|
5 | 5 | # modify it under the terms of the GNU General Public License |
|
|
6 | 6 | # as published by the Free Software Foundation; either version 2 |
|
|
7 | 7 | # of the License, or (at your option) any later version. |
|
|
8 | 8 | # |
|
|
9 | 9 | # This program is distributed in the hope that it will be useful, |
|
|
10 | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
11 | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
12 | 12 | # GNU General Public License for more details. |
|
|
13 | 13 | # |
|
|
14 | 14 | # You should have received a copy of the GNU General Public License |
|
|
15 | 15 | # along with this program; if not, write to the Free Software |
|
|
16 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
17 | 17 | |
|
|
18 | 18 | class NewsController < ApplicationController |
|
|
19 | 19 | default_search_scope :news |
|
|
20 | 20 | model_object News |
|
|
21 | 21 | before_filter :find_model_object, :except => [:new, :create, :index] |
|
|
22 | 22 | before_filter :find_project_from_association, :except => [:new, :create, :index] |
|
|
23 | 23 | before_filter :find_project, :only => [:new, :create] |
|
|
24 | 24 | before_filter :authorize, :except => [:index] |
|
|
25 | 25 | before_filter :find_optional_project, :only => :index |
|
|
26 | 26 | accept_rss_auth :index |
|
|
27 | 27 | accept_api_auth :index |
|
|
28 | 28 | |
|
|
29 | 29 | helper :watchers |
|
|
30 | 30 | |
|
|
31 | 31 | def index |
|
|
32 | 32 | case params[:format] |
|
|
33 | 33 | when 'xml', 'json' |
|
|
34 | 34 | @offset, @limit = api_offset_and_limit |
|
|
35 | 35 | else |
|
|
36 | 36 | @limit = 10 |
|
|
37 | 37 | end |
|
|
38 | 38 | |
|
|
39 | 39 | scope = @project ? @project.news.visible : News.visible |
|
|
40 | 40 | |
|
|
41 | 41 | @news_count = scope.count |
|
|
42 | 42 | @news_pages = Paginator.new self, @news_count, @limit, params['page'] |
|
|
43 | 43 | @offset ||= @news_pages.current.offset |
|
|
44 | 44 | @newss = scope.all(:include => [:author, :project], |
|
|
45 | 45 | :order => "#{News.table_name}.created_on DESC", |
|
|
46 | 46 | :offset => @offset, |
|
|
47 | 47 | :limit => @limit) |
|
|
48 | 48 | |
|
|
49 | 49 | respond_to do |format| |
|
|
50 | format.html { render :layout => false if request.xhr? } | |
|
|
50 | format.html { | |
|
|
51 | @news = News.new # for adding news inline | |
|
|
52 | render :layout => false if request.xhr? | |
|
|
53 | } | |
|
|
51 | 54 | format.api |
|
|
52 | 55 | format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") } |
|
|
53 | 56 | end |
|
|
54 | 57 | end |
|
|
55 | 58 | |
|
|
56 | 59 | def show |
|
|
57 | 60 | @comments = @news.comments |
|
|
58 | 61 | @comments.reverse! if User.current.wants_comments_in_reverse_order? |
|
|
59 | 62 | end |
|
|
60 | 63 | |
|
|
61 | 64 | def new |
|
|
62 | 65 | @news = News.new(:project => @project, :author => User.current) |
|
|
63 | 66 | end |
|
|
64 | 67 | |
|
|
65 | 68 | def create |
|
|
66 | 69 | @news = News.new(:project => @project, :author => User.current) |
|
|
67 | 70 | if request.post? |
|
|
68 | 71 | @news.attributes = params[:news] |
|
|
69 | 72 | if @news.save |
|
|
70 | 73 | flash[:notice] = l(:notice_successful_create) |
|
|
71 | 74 | redirect_to :controller => 'news', :action => 'index', :project_id => @project |
|
|
72 | 75 | else |
|
|
73 | 76 | render :action => 'new' |
|
|
74 | 77 | end |
|
|
75 | 78 | end |
|
|
76 | 79 | end |
|
|
77 | 80 | |
|
|
78 | 81 | def edit |
|
|
79 | 82 | end |
|
|
80 | 83 | |
|
|
81 | 84 | def update |
|
|
82 | 85 | if request.put? and @news.update_attributes(params[:news]) |
|
|
83 | 86 | flash[:notice] = l(:notice_successful_update) |
|
|
84 | 87 | redirect_to :action => 'show', :id => @news |
|
|
85 | 88 | else |
|
|
86 | 89 | render :action => 'edit' |
|
|
87 | 90 | end |
|
|
88 | 91 | end |
|
|
89 | 92 | |
|
|
90 | 93 | def destroy |
|
|
91 | 94 | @news.destroy |
|
|
92 | 95 | redirect_to :action => 'index', :project_id => @project |
|
|
93 | 96 | end |
|
|
94 | 97 | |
|
|
95 | 98 | private |
|
|
96 | 99 | def find_project |
|
|
97 | 100 | @project = Project.find(params[:project_id]) |
|
|
98 | 101 | rescue ActiveRecord::RecordNotFound |
|
|
99 | 102 | render_404 |
|
|
100 | 103 | end |
|
|
101 | 104 | |
|
|
102 | 105 | def find_optional_project |
|
|
103 | 106 | return true unless params[:project_id] |
|
|
104 | 107 | @project = Project.find(params[:project_id]) |
|
|
105 | 108 | authorize |
|
|
106 | 109 | rescue ActiveRecord::RecordNotFound |
|
|
107 | 110 | render_404 |
|
|
108 | 111 | end |
|
|
109 | 112 | end |
| @@ -1,18 +1,17 | |||
|
|
1 | 1 | <h2><%=l(:label_news)%></h2> |
|
|
2 | 2 | |
|
|
3 | <% labelled_tabular_form_for :news, @news, :url => news_path(@news), | |
|
|
4 | :html => { :id => 'news-form', :method => :put } do |f| %> | |
|
|
3 | <% labelled_tabular_form_for @news, :html => { :id => 'news-form', :method => :put } do |f| %> | |
|
|
5 | 4 | <%= render :partial => 'form', :locals => { :f => f } %> |
|
|
6 | 5 | <%= submit_tag l(:button_save) %> |
|
|
7 | 6 | <%= link_to_remote l(:label_preview), |
|
|
8 | 7 | { :url => preview_news_path(:project_id => @project), |
|
|
9 | 8 | :method => 'get', |
|
|
10 | 9 | :update => 'preview', |
|
|
11 | 10 | :with => "Form.serialize('news-form')" |
|
|
12 | 11 | }, :accesskey => accesskey(:preview) %> |
|
|
13 | 12 | <% end %> |
|
|
14 | 13 | <div id="preview" class="wiki"></div> |
|
|
15 | 14 | |
|
|
16 | 15 | <% content_for :header_tags do %> |
|
|
17 | 16 | <%= stylesheet_link_tag 'scm' %> |
|
|
18 | 17 | <% end %> |
| @@ -1,51 +1,51 | |||
|
|
1 | 1 | <div class="contextual"> |
|
|
2 | 2 | <%= link_to(l(:label_news_new), |
|
|
3 | 3 | new_project_news_path(@project), |
|
|
4 | 4 | :class => 'icon icon-add', |
|
|
5 | 5 | :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %> |
|
|
6 | 6 | </div> |
|
|
7 | 7 | |
|
|
8 | 8 | <div id="add-news" style="display:none;"> |
|
|
9 | 9 | <h2><%=l(:label_news_new)%></h2> |
|
|
10 |
<% labelled_tabular_form_for |
|
|
|
10 | <% labelled_tabular_form_for @news, :url => project_news_index_path(@project), | |
|
|
11 | 11 | :html => { :id => 'news-form' } do |f| %> |
|
|
12 | 12 | <%= render :partial => 'news/form', :locals => { :f => f } %> |
|
|
13 | 13 | <%= submit_tag l(:button_create) %> |
|
|
14 | 14 | <%= link_to_remote l(:label_preview), |
|
|
15 | 15 | { :url => preview_news_path(:project_id => @project), |
|
|
16 | 16 | :method => 'get', |
|
|
17 | 17 | :update => 'preview', |
|
|
18 | 18 | :with => "Form.serialize('news-form')" |
|
|
19 | 19 | }, :accesskey => accesskey(:preview) %> | |
|
|
20 | 20 | <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %> |
|
|
21 | 21 | <% end if @project %> |
|
|
22 | 22 | <div id="preview" class="wiki"></div> |
|
|
23 | 23 | </div> |
|
|
24 | 24 | |
|
|
25 | 25 | <h2><%=l(:label_news_plural)%></h2> |
|
|
26 | 26 | |
|
|
27 | 27 | <% if @newss.empty? %> |
|
|
28 | 28 | <p class="nodata"><%= l(:label_no_data) %></p> |
|
|
29 | 29 | <% else %> |
|
|
30 | 30 | <% @newss.each do |news| %> |
|
|
31 | 31 | <h3><%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %> |
|
|
32 | 32 | <%= link_to h(news.title), news_path(news) %> |
|
|
33 | 33 | <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3> |
|
|
34 | 34 | <p class="author"><%= authoring news.created_on, news.author %></p> |
|
|
35 | 35 | <div class="wiki"> |
|
|
36 | 36 | <%= textilizable(news.description) %> |
|
|
37 | 37 | </div> |
|
|
38 | 38 | <% end %> |
|
|
39 | 39 | <% end %> |
|
|
40 | 40 | <p class="pagination"><%= pagination_links_full @news_pages %></p> |
|
|
41 | 41 | |
|
|
42 | 42 | <% other_formats_links do |f| %> |
|
|
43 | 43 | <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> |
|
|
44 | 44 | <% end %> |
|
|
45 | 45 | |
|
|
46 | 46 | <% content_for :header_tags do %> |
|
|
47 | 47 | <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> |
|
|
48 | 48 | <%= stylesheet_link_tag 'scm' %> |
|
|
49 | 49 | <% end %> |
|
|
50 | 50 | |
|
|
51 | 51 | <% html_title(l(:label_news_plural)) -%> |
| @@ -1,14 +1,14 | |||
|
|
1 | 1 | <h2><%=l(:label_news_new)%></h2> |
|
|
2 | 2 | |
|
|
3 |
<% labelled_tabular_form_for |
|
|
|
3 | <% labelled_tabular_form_for @news, :url => project_news_index_path(@project), | |
|
|
4 | 4 | :html => { :id => 'news-form' } do |f| %> |
|
|
5 | 5 | <%= render :partial => 'news/form', :locals => { :f => f } %> |
|
|
6 | 6 | <%= submit_tag l(:button_create) %> |
|
|
7 | 7 | <%= link_to_remote l(:label_preview), |
|
|
8 | 8 | { :url => preview_news_path(:project_id => @project), |
|
|
9 | 9 | :method => 'get', |
|
|
10 | 10 | :update => 'preview', |
|
|
11 | 11 | :with => "Form.serialize('news-form')" |
|
|
12 | 12 | }, :accesskey => accesskey(:preview) %> |
|
|
13 | 13 | <% end %> |
|
|
14 | 14 | <div id="preview" class="wiki"></div> |
General Comments 0
You need to be logged in to leave comments.
Login now