diff app/controllers/.svn/text-base/news_controller.rb.svn-base @ 41:7f0e922c8982 luisf

merged with new version from trunk

--- a/app/controllers/.svn/text-base/news_controller.rb.svn-base	Thu Nov 18 17:50:11 2010 +0000
+++ b/app/controllers/.svn/text-base/news_controller.rb.svn-base	Fri Nov 19 14:45:28 2010 +0000
@@ -18,10 +18,10 @@
 class NewsController < ApplicationController
   default_search_scope :news
   model_object News
-  before_filter :find_model_object, :except => [:new, :create, :index, :preview]
-  before_filter :find_project_from_association, :except => [:new, :create, :index, :preview]
-  before_filter :find_project, :only => [:new, :create, :preview]
-  before_filter :authorize, :except => [:index, :preview]
+  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_key_auth :index
   
@@ -78,11 +78,6 @@
     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
     @project = Project.find(params[:project_id])