From 4d7ca63a12aed1f640aee8dd6d65aa92bbc6fd04 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 30 Oct 2015 11:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=8E=A7=E5=88=B6=20=E5=9C=A8=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AE=BE=E7=BD=AE=E5=A4=A7=E7=BA=B2=E4=B8=8D?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=20=E5=9C=A8=E5=A4=A7=E7=BA=B2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E9=9D=A2=E8=AE=BE=E7=BD=AE=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=A4=A7=E7=BA=B2=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb            | 2 ++
 app/views/courses/_course_outlines_list.html.erb | 1 +
 app/views/courses/course_outline.js.erb          | 4 ++--
 app/views/courses/set_course_outline.js.erb      | 3 +++
 app/views/courses/show_course_outline.html.erb   | 2 +-
 public/javascripts/course.js                     | 4 ++--
 6 files changed, 11 insertions(+), 5 deletions(-)

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 @@
   </div>
   <span class="f12 c_red fl mb8" id="course_outline_hint" style="display: none">未搜索到对应大纲，请重新输入</span>
  <%= form_tag(url_for(:controller=>'courses',:action=>'set_course_outline',:id=>course.id),:method=>'post',:remote=>'true')  do %>
+    <input name="is_in_show_outline_page" value="<%= show_page %>" type="hidden" />
   <div class="blogBlock fl" id="course_outline_list" >
     <% 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(' <a href="javascript:void(0);" onclick="hideModal()" class="resourceClose" style="margin-left: 285px"></a>');
 $('#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('<a href="<%=show_course_outline_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>')
 <%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 @@
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <a class="postOptionLink " onclick="course_outline('<%= @course.id%>')" >重设大纲</a>
+                    <a class="postOptionLink " onclick="course_outline('<%= @course.id%>','Y')" >重设大纲</a>
                   </li>
                   <li>
                     <%= 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(){