##// END OF EJS Templates
remove trailing white-spaces from app/controllers/news_controller.rb....
Toshi MARUYAMA -
r6689:239bc3c795a2
parent child
Show More
@@ -5,12 +5,12
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -25,9 +25,9 class NewsController < ApplicationController
25 before_filter :find_optional_project, :only => :index
25 before_filter :find_optional_project, :only => :index
26 accept_rss_auth :index
26 accept_rss_auth :index
27 accept_api_auth :index
27 accept_api_auth :index
28
28
29 helper :watchers
29 helper :watchers
30
30
31 def index
31 def index
32 case params[:format]
32 case params[:format]
33 when 'xml', 'json'
33 when 'xml', 'json'
@@ -35,9 +35,9 class NewsController < ApplicationController
35 else
35 else
36 @limit = 10
36 @limit = 10
37 end
37 end
38
38
39 scope = @project ? @project.news.visible : News.visible
39 scope = @project ? @project.news.visible : News.visible
40
40
41 @news_count = scope.count
41 @news_count = scope.count
42 @news_pages = Paginator.new self, @news_count, @limit, params['page']
42 @news_pages = Paginator.new self, @news_count, @limit, params['page']
43 @offset ||= @news_pages.current.offset
43 @offset ||= @news_pages.current.offset
@@ -45,14 +45,14 class NewsController < ApplicationController
45 :order => "#{News.table_name}.created_on DESC",
45 :order => "#{News.table_name}.created_on DESC",
46 :offset => @offset,
46 :offset => @offset,
47 :limit => @limit)
47 :limit => @limit)
48
48
49 respond_to do |format|
49 respond_to do |format|
50 format.html { render :layout => false if request.xhr? }
50 format.html { render :layout => false if request.xhr? }
51 format.api
51 format.api
52 format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
52 format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
53 end
53 end
54 end
54 end
55
55
56 def show
56 def show
57 @comments = @news.comments
57 @comments = @news.comments
58 @comments.reverse! if User.current.wants_comments_in_reverse_order?
58 @comments.reverse! if User.current.wants_comments_in_reverse_order?
@@ -77,7 +77,7 class NewsController < ApplicationController
77
77
78 def edit
78 def edit
79 end
79 end
80
80
81 def update
81 def update
82 if request.put? and @news.update_attributes(params[:news])
82 if request.put? and @news.update_attributes(params[:news])
83 flash[:notice] = l(:notice_successful_update)
83 flash[:notice] = l(:notice_successful_update)
@@ -91,14 +91,14 class NewsController < ApplicationController
91 @news.destroy
91 @news.destroy
92 redirect_to :action => 'index', :project_id => @project
92 redirect_to :action => 'index', :project_id => @project
93 end
93 end
94
94
95 private
95 private
96 def find_project
96 def find_project
97 @project = Project.find(params[:project_id])
97 @project = Project.find(params[:project_id])
98 rescue ActiveRecord::RecordNotFound
98 rescue ActiveRecord::RecordNotFound
99 render_404
99 render_404
100 end
100 end
101
101
102 def find_optional_project
102 def find_optional_project
103 return true unless params[:project_id]
103 return true unless params[:project_id]
104 @project = Project.find(params[:project_id])
104 @project = Project.find(params[:project_id])
General Comments 0
You need to be logged in to leave comments. Login now