From f05aee0ca22bcc55eb24ce99abc04874645a78dc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 15 Oct 2014 09:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BE=9A=E4=B9=90=E9=91=AB=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=84=8F=E8=A7=814=EF=BC=9A=E5=8E=BB=E9=99=A4render=20action?=
 =?UTF-8?q?=20=E4=B9=8B=E5=89=8D=E8=B0=83=E7=94=A8=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=20action=20=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb              | 1 -
 app/controllers/settings_controller.rb             | 1 -
 app/controllers/trackers_controller.rb             | 1 -
 app/controllers/web_footer_companies_controller.rb | 2 --
 app/controllers/wiki_controller.rb                 | 1 -
 5 files changed, 6 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a9a02045f..3113001e4 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -86,7 +86,6 @@ class CoursesController < ApplicationController
     else
       respond_to do |format|
         format.html {
-          settings
           render :action => 'settings'
         }
         format.api  { render_validation_errors(@course) }
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 586c23956..3e4b7eb87 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -24,7 +24,6 @@ class SettingsController < ApplicationController
   before_filter :require_admin
 
   def index
-    edit
     render :action => 'edit'
   end
 
diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index a317f82de..e6b7b1b4b 100644
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -57,7 +57,6 @@ class TrackersController < ApplicationController
       redirect_to trackers_path
       return
     end
-    new
     render :action => 'new'
   end
 
diff --git a/app/controllers/web_footer_companies_controller.rb b/app/controllers/web_footer_companies_controller.rb
index 499e6288d..74393a06c 100644
--- a/app/controllers/web_footer_companies_controller.rb
+++ b/app/controllers/web_footer_companies_controller.rb
@@ -20,7 +20,6 @@ class WebFooterCompaniesController < ApplicationController
       redirect_to web_footer_companies_path
     else
       flash[:error] = "#{l :web_footer_company_create_fail}: #{@company.errors.full_messages[0]}"
-      new
       render :action => 'new'
     end
   end
@@ -42,7 +41,6 @@ class WebFooterCompaniesController < ApplicationController
       redirect_to web_footer_companies_path
     else
       flash[:error] = "#{l :web_footer_company_update_fail}: #{@company.errors.full_messages[0]}"
-      edit
       render :action => 'edit'
     end
   end
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 39b3b1753..ac60a7bb8 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -68,7 +68,6 @@ class WikiController < ApplicationController
   def show
     if @page.new_record?
       if User.current.allowed_to?(:edit_wiki_pages, @project) && editable? && !api_request?
-        edit
         render :action => 'edit'
       else
         render_404