From 9a5dba777382bc39172e09738c9156ea4e2adacf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 28 Sep 2015 17:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=86=85=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E5=88=A0=E9=99=A4=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=90=8E=E8=B7=B3=E8=BD=AC=E4=BB=8D=E5=9C=A8=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=86=85=E7=9A=84=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb          | 8 +++++++-
 app/views/homework_common/index.html.erb     | 3 ++-
 app/views/users/_user_homework_list.html.erb | 4 ++--
 app/views/users/user_homeworks.html.erb      | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9a6f72e2e..6caa137ee 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -508,7 +508,13 @@ class UsersController < ApplicationController
         if homework.save
           homework_detail_manual.save if homework_detail_manual
           homework_detail_programing.save if homework_detail_programing
-          redirect_to user_homeworks_user_path(User.current.id)
+
+          if params[:is_in_course] == "1"
+            redirect_to homework_common_index_path(:course => homework.course_id)
+          else
+            redirect_to user_homeworks_user_path(User.current.id)
+          end
+
         end
       end
     else
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 8a89d66bc..4a4c95757 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -30,12 +30,13 @@
         <%= labelled_form_for @new_homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
             <div id="HomeWorkCon">
               <%= render :partial => 'users/user_homework_form', :locals => { :homework => @new_homework,:f => f,:edit_mode => false,:select_course => false } %>
+              <input type="hidden" name="is_in_course" value="1"/>
             </div>
         <% end%>
       </div><!----HomeWork end-->
   <% end%>
 
-  <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0} %>
+  <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0,:is_in_course => 1} %>
 </div>
 <div class="cl"></div>
 
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index f7017deab..dbbc619a3 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -58,10 +58,10 @@
                   <li class="homepagePostSettingIcon">
                     <ul class="homepagePostSettiongText">
                       <li>
-                        <%= link_to l(:button_edit),edit_homework_common_path(homework_common,:is_in_course => 0), :class => "postOptionLink"%>
+                        <%= link_to l(:button_edit),edit_homework_common_path(homework_common,:is_in_course => is_in_course), :class => "postOptionLink"%>
                       </li>
                       <li>
-                        <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                        <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => is_in_course),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                       </li>
                       <li>
                         <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true) if homework_common.homework_detail_manual.comment_status == 1%>
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index a37709b69..7b212101c 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -26,4 +26,4 @@
     </div><!----HomeWork end-->
 <% end%>
 
-<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0} %>
+<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0,:is_in_course => 0} %>