From b7a6bc361418512ab3334a5444fea540e93b1c7f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 30 Oct 2015 17:21:12 +0800
Subject: [PATCH] outline url
---
app/controllers/blog_comments_controller.rb | 4 ++--
app/controllers/courses_controller.rb | 2 +-
app/views/courses/set_course_outline.js.erb | 4 ++--
.../{show_course_outline.html.erb => syllabus.html.erb} | 0
app/views/layouts/base_courses.html.erb | 6 +++---
config/routes.rb | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
rename app/views/courses/{show_course_outline.html.erb => syllabus.html.erb} (100%)
diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb
index ce0d7481a..b92223edc 100644
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@@ -71,7 +71,7 @@ class BlogCommentsController < ApplicationController
else#如果是回复被删，
if params[:course_id] #如果带了course_id过来了，那么这是要跳到课程大纲去的
@article.delete
- redirect_to show_course_outline_course_path(:id=>params[:course_id])
+ redirect_to syllabus_course_path(:id=>params[:course_id])
else
root = @article.root
@article.delete
@@ -131,7 +131,7 @@ class BlogCommentsController < ApplicationController
respond_to do |format|
format.html {
if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
- redirect_to show_course_outline_course_path(:id=>params[:course_id])
+ redirect_to syllabus_course_path(:id=>params[:course_id])
else
redirect_to user_blog_blog_comment_path(:user_id=>@article.author_id,:blog_id=>@article.blog_id,:id=>@article)
end
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index c9d632fec..0a3c61c90 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -740,7 +740,7 @@ class CoursesController < ApplicationController
end
#显示课程大纲
- def show_course_outline
+ def syllabus
@article = BlogComment.find(@course.outline)
respond_to do |format|
format.html {render :layout => 'base_courses'}
diff --git a/app/views/courses/set_course_outline.js.erb b/app/views/courses/set_course_outline.js.erb
index af075d2b8..a43a62c7d 100644
--- a/app/views/courses/set_course_outline.js.erb
+++ b/app/views/courses/set_course_outline.js.erb
@@ -1,8 +1,8 @@
hideModal();
<%if @course.tea_id == User.current.id && @course.outline == 0 %>
<% else %>
- $("#course_outline_bar").html(' ')
+ $("#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) %>';
+ window.location.href='<%=syllabus_course_path(@course) %>';
<% end %>
diff --git a/app/views/courses/show_course_outline.html.erb b/app/views/courses/syllabus.html.erb
similarity index 100%
rename from app/views/courses/show_course_outline.html.erb
rename to app/views/courses/syllabus.html.erb
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 05ee7e086..98e8f378d 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -89,11 +89,11 @@
<%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 || BlogComment.where(:id=>@course.outline).count == 0) %>
<% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%>
-
+
<% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course) && @course.outline != 0%>
-
+
<% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%>
-
+
<%else%>
<%end %>
diff --git a/config/routes.rb b/config/routes.rb
index 5be734dee..9a6b48da2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -792,7 +792,7 @@ RedmineApp::Application.routes.draw do
get 'course_outline'
post 'search_course_outline'
post 'set_course_outline'
- get 'show_course_outline'
+ get 'syllabus'
end
collection do
match 'join_private_courses', :via => [:get, :post]