remove trailing white-spaces from app/controllers/issue_relations_controller.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6889 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-08-31 11:14:13 +00:00
parent d439e12aa5
commit cd410eb38e

View File

@ -5,12 +5,12 @@
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@ -18,18 +18,18 @@
class IssueRelationsController < ApplicationController class IssueRelationsController < ApplicationController
before_filter :find_issue, :find_project_from_association, :authorize, :only => [:index, :create] before_filter :find_issue, :find_project_from_association, :authorize, :only => [:index, :create]
before_filter :find_relation, :except => [:index, :create] before_filter :find_relation, :except => [:index, :create]
accept_api_auth :index, :show, :create, :destroy accept_api_auth :index, :show, :create, :destroy
def index def index
@relations = @issue.relations @relations = @issue.relations
respond_to do |format| respond_to do |format|
format.html { render :nothing => true } format.html { render :nothing => true }
format.api format.api
end end
end end
def show def show
raise Unauthorized unless @relation.visible? raise Unauthorized unless @relation.visible?
@ -40,7 +40,7 @@ class IssueRelationsController < ApplicationController
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render_404 render_404
end end
verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed } verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
def create def create
@relation = IssueRelation.new(params[:relation]) @relation = IssueRelation.new(params[:relation])
@ -49,7 +49,7 @@ class IssueRelationsController < ApplicationController
@relation.issue_to = Issue.visible.find_by_id(m[1].to_i) @relation.issue_to = Issue.visible.find_by_id(m[1].to_i)
end end
saved = @relation.save saved = @relation.save
respond_to do |format| respond_to do |format|
format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue } format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
format.js do format.js do
@ -62,7 +62,7 @@ class IssueRelationsController < ApplicationController
end end
end end
end end
format.api { format.api {
if saved if saved
render :action => 'show', :status => :created, :location => relation_url(@relation) render :action => 'show', :status => :created, :location => relation_url(@relation)
else else
@ -71,12 +71,12 @@ class IssueRelationsController < ApplicationController
} }
end end
end end
verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed } verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
def destroy def destroy
raise Unauthorized unless @relation.deletable? raise Unauthorized unless @relation.deletable?
@relation.destroy @relation.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue } format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
format.js { render(:update) {|page| page.remove "relation-#{@relation.id}"} } format.js { render(:update) {|page| page.remove "relation-#{@relation.id}"} }
@ -85,14 +85,14 @@ class IssueRelationsController < ApplicationController
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render_404 render_404
end end
private private
def find_issue def find_issue
@issue = @object = Issue.find(params[:issue_id]) @issue = @object = Issue.find(params[:issue_id])
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render_404 render_404
end end
def find_relation def find_relation
@relation = IssueRelation.find(params[:id]) @relation = IssueRelation.find(params[:id])
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound