diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 3c211b361..c9d632fec 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -715,6 +715,7 @@ class CoursesController < ApplicationController
def course_outline
@teacher = User.find(@course.tea_id)
@blog_articles = @teacher.blog.articles
+ @is_in_show_outline_page = params[:is_in_show_outline_page]
respond_to do |format|
format.js
end
@@ -732,6 +733,7 @@ class CoursesController < ApplicationController
def set_course_outline
@course.outline = params[:outline_id]
@course.save
+ @is_in_show_outline_page = params[:is_in_show_outline_page]
respond_to do |format|
format.js
end
diff --git a/app/views/courses/_course_outlines_list.html.erb b/app/views/courses/_course_outlines_list.html.erb
index e3b441f24..6710c22ba 100644
--- a/app/views/courses/_course_outlines_list.html.erb
+++ b/app/views/courses/_course_outlines_list.html.erb
@@ -10,6 +10,7 @@
未搜索到对应大纲,请重新输入
<%= form_tag(url_for(:controller=>'courses',:action=>'set_course_outline',:id=>course.id),:method=>'post',:remote=>'true') do %>
+
<% unless articles.blank? %>
<% articles.each do |article|%>
diff --git a/app/views/courses/course_outline.js.erb b/app/views/courses/course_outline.js.erb
index f747661b8..490361a24 100644
--- a/app/views/courses/course_outline.js.erb
+++ b/app/views/courses/course_outline.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'course_outlines_list',:locals => {:articles=>@blog_articles,:course=>@course}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'course_outlines_list',:locals => {:articles=>@blog_articles,:course=>@course,:show_page=>@is_in_show_outline_page}) %>');
showModal('ajax-modal', '300px');
//$('#ajax-modal').css('height','250px');
$('#ajax-modal').css('padding-top','0px');
@@ -6,4 +6,4 @@ $('#ajax-modal').siblings().remove();
$('#ajax-modal').before('
');
$('#ajax-modal').parent().css("top","30%").css("left","50%");
$('#ajax-modal').parent().addClass("courseOutlinePopup");
-$('#ajax-modal').css("padding-left","16px")//.css("padding-bottom","16px");
\ No newline at end of file
+$('#ajax-modal').css("padding-left","16px")//.css("padding-bottom","16px");
diff --git a/app/views/courses/set_course_outline.js.erb b/app/views/courses/set_course_outline.js.erb
index febcb0b1f..af075d2b8 100644
--- a/app/views/courses/set_course_outline.js.erb
+++ b/app/views/courses/set_course_outline.js.erb
@@ -3,3 +3,6 @@ hideModal();
<% else %>
$("#course_outline_bar").html('
')
<%end %>
+<%if @is_in_show_outline_page && @is_in_show_outline_page == 'Y'%>
+ window.location.href='<%=show_course_outline_course_path(@course) %>';
+<% end %>
diff --git a/app/views/courses/show_course_outline.html.erb b/app/views/courses/show_course_outline.html.erb
index 3af869e2d..18a980209 100644
--- a/app/views/courses/show_course_outline.html.erb
+++ b/app/views/courses/show_course_outline.html.erb
@@ -51,7 +51,7 @@
-
- 重设大纲
+ 重设大纲
-
<%= link_to(
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index ddd323166..68ffeb46b 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -1224,10 +1224,10 @@ var autoTextarea2 = function (elem,elem2, extra, maxHeight) {
change();
};
-//课程大纲选择请求
+//课程大纲选择请求,第二个参数是可选的,判断当前页面是大纲显示页面还是 课程首页
function course_outline(id){
$.get(
- ' /courses/'+id+'/course_outline'
+ ' /courses/'+id+'/course_outline'+"?is_in_show_outline_page="+(arguments[1] ? arguments[1] : 'N')
)
}
//$(function(){