diff .svn/pristine/ab/ab1771a93ca21896e5fcd177b31086235de0d81c.svn-base @ 935:fe0249c097f6 live

Merge from the default branch

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/ab/ab1771a93ca21896e5fcd177b31086235de0d81c.svn-base	Wed Jul 11 13:33:14 2012 +0100
@@ -0,0 +1,112 @@
+# Redmine - project management software
+# Copyright (C) 2006-2011  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class NewsController < ApplicationController
+  default_search_scope :news
+  model_object News
+  before_filter :find_model_object, :except => [:new, :create, :index]
+  before_filter :find_project_from_association, :except => [:new, :create, :index]
+  before_filter :find_project, :only => [:new, :create]
+  before_filter :authorize, :except => [:index]
+  before_filter :find_optional_project, :only => :index
+  accept_rss_auth :index
+  accept_api_auth :index
+
+  helper :watchers
+
+  def index
+    case params[:format]
+    when 'xml', 'json'
+      @offset, @limit = api_offset_and_limit
+    else
+      @limit =  10
+    end
+
+    scope = @project ? @project.news.visible : News.visible
+
+    @news_count = scope.count
+    @news_pages = Paginator.new self, @news_count, @limit, params['page']
+    @offset ||= @news_pages.current.offset
+    @newss = scope.all(:include => [:author, :project],
+                                       :order => "#{News.table_name}.created_on DESC",
+                                       :offset => @offset,
+                                       :limit => @limit)
+
+    respond_to do |format|
+      format.html {
+        @news = News.new # for adding news inline
+        render :layout => false if request.xhr?
+      }
+      format.api
+      format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
+    end
+  end
+
+  def show
+    @comments = @news.comments
+    @comments.reverse! if User.current.wants_comments_in_reverse_order?
+  end
+
+  def new
+    @news = News.new(:project => @project, :author => User.current)
+  end
+
+  def create
+    @news = News.new(:project => @project, :author => User.current)
+    if request.post?
+      @news.attributes = params[:news]
+      if @news.save
+        flash[:notice] = l(:notice_successful_create)
+        redirect_to :controller => 'news', :action => 'index', :project_id => @project
+      else
+        render :action => 'new'
+      end
+    end
+  end
+
+  def edit
+  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 destroy
+    @news.destroy
+    redirect_to :action => 'index', :project_id => @project
+  end
+
+private
+  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])
+    authorize
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end