summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-30 13:07:52 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-30 13:07:52 +0000
commitc3a9d10e3b7fb33798807408e16c6ae7e81ebfe1 (patch)
tree1545636b520ee270f61afc593b731b2ea734263c /app/controllers
parent52b7603d7760e91cdd1a29f50aafd28b4785fc3f (diff)
downloadredmine-c3a9d10e3b7fb33798807408e16c6ae7e81ebfe1.tar.gz
redmine-c3a9d10e3b7fb33798807408e16c6ae7e81ebfe1.zip
remove trailing white-spaces from app/controllers/documents_controller.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6803 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/documents_controller.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 92a958f6c..09b76781f 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# 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.
@@ -22,9 +22,9 @@ class DocumentsController < ApplicationController
before_filter :find_model_object, :except => [:index, :new]
before_filter :find_project_from_association, :except => [:index, :new]
before_filter :authorize
-
+
helper :attachments
-
+
def index
@sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
documents = @project.documents.find :all, :include => [:attachments, :category]
@@ -41,13 +41,13 @@ class DocumentsController < ApplicationController
@document = @project.documents.build
render :layout => false if request.xhr?
end
-
+
def show
@attachments = @document.attachments.find(:all, :order => "created_on DESC")
end
def new
- @document = @project.documents.build(params[:document])
+ @document = @project.documents.build(params[:document])
if request.post? and @document.save
attachments = Attachment.attach_files(@document, params[:attachments])
render_attachment_warning_if_needed(@document)
@@ -55,20 +55,20 @@ class DocumentsController < ApplicationController
redirect_to :action => 'index', :project_id => @project
end
end
-
+
def edit
@categories = DocumentCategory.active #TODO: use it in the views
if request.post? and @document.update_attributes(params[:document])
flash[:notice] = l(:notice_successful_update)
redirect_to :action => 'show', :id => @document
end
- end
+ end
def destroy
@document.destroy
redirect_to :controller => 'documents', :action => 'index', :project_id => @project
end
-
+
def add_attachment
attachments = Attachment.attach_files(@document, params[:attachments])
render_attachment_warning_if_needed(@document)