课程内发布、修改、删除作业后跳转仍在课程内的作业列表
This commit is contained in:
parent
6194be8933
commit
9a5dba7773
|
@ -508,7 +508,13 @@ class UsersController < ApplicationController
|
||||||
if homework.save
|
if homework.save
|
||||||
homework_detail_manual.save if homework_detail_manual
|
homework_detail_manual.save if homework_detail_manual
|
||||||
homework_detail_programing.save if homework_detail_programing
|
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
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
|
@ -30,12 +30,13 @@
|
||||||
<%= labelled_form_for @new_homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
|
<%= labelled_form_for @new_homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
|
||||||
<div id="HomeWorkCon">
|
<div id="HomeWorkCon">
|
||||||
<%= render :partial => 'users/user_homework_form', :locals => { :homework => @new_homework,:f => f,:edit_mode => false,:select_course => false } %>
|
<%= 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>
|
</div>
|
||||||
<% end%>
|
<% end%>
|
||||||
</div><!----HomeWork end-->
|
</div><!----HomeWork end-->
|
||||||
<% 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>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
|
|
||||||
|
|
|
@ -58,10 +58,10 @@
|
||||||
<li class="homepagePostSettingIcon">
|
<li class="homepagePostSettingIcon">
|
||||||
<ul class="homepagePostSettiongText">
|
<ul class="homepagePostSettiongText">
|
||||||
<li>
|
<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>
|
||||||
<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>
|
||||||
<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%>
|
<%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true) if homework_common.homework_detail_manual.comment_status == 1%>
|
||||||
|
|
|
@ -26,4 +26,4 @@
|
||||||
</div><!----HomeWork end-->
|
</div><!----HomeWork end-->
|
||||||
<% 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} %>
|
||||||
|
|
Loading…
Reference in New Issue