From 447e624f3640ad870e695661628c78836a49fa11 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 21:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/syllabuses_helper.rb                    | 12 ++++++------
 app/views/courses/private_or_public.js.erb          |  4 ++--
 app/views/layouts/_syllabus_base_info.html.erb      |  6 +++---
 app/views/syllabuses/_syllabus_course_list.html.erb |  2 +-
 app/views/users/_user_course_list.html.erb          |  2 +-
 app/views/users/_user_syllabus_list.html.erb        |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/helpers/syllabuses_helper.rb b/app/helpers/syllabuses_helper.rb
index 00331e0dc..7e815950b 100644
--- a/app/helpers/syllabuses_helper.rb
+++ b/app/helpers/syllabuses_helper.rb
@@ -48,17 +48,17 @@ module SyllabusesHelper
     option6 = []
 
     option1 << "请选择"
-    option1 << 1
+    option1 << 0
     option2 << "公共必修课"
-    option2 << 2
+    option2 << 1
     option3 << "学科必修课"
-    option3 << 3
+    option3 << 2
     option4 << "专业选修课"
-    option4 << 4
+    option4 << 3
     option5 << "实践必修课"
-    option5 << 5
+    option5 << 4
     option6 << "实践选修课"
-    option6 << 6
+    option6 << 5
 
     type << option1
     type << option2
diff --git a/app/views/courses/private_or_public.js.erb b/app/views/courses/private_or_public.js.erb
index 4e512a6a0..82180c452 100644
--- a/app/views/courses/private_or_public.js.erb
+++ b/app/views/courses/private_or_public.js.erb
@@ -9,9 +9,9 @@
     }
 <% else %>
     <% if @course.is_public? %>
-        $("#show_course_<%= @course.id %>").attr("title","公开课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
+        $("#show_course_<%= @course.id %>").attr("title","公开班级：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% else %>
-        $("#show_course_<%= @course.id %>").attr("title","私有课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
+        $("#show_course_<%= @course.id %>").attr("title","私有班级：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% end %>
     $("#set_course_public_<%= @course.id %>").replaceWith('<%= escape_javascript(link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => "courses", :action => "private_or_public", :id => @course,:user_page => true},
                                 :id => "set_course_public_#{@course.id.to_s}",:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗") %>');
diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb
index cf4926d82..ae6da2ac3 100644
--- a/app/views/layouts/_syllabus_base_info.html.erb
+++ b/app/views/layouts/_syllabus_base_info.html.erb
@@ -4,7 +4,7 @@
   <% end %>
   <div class="cl"></div>
   <li><label >创建教师：</label><span><%=syllabus.user.show_name %></span></li>
-  <% unless syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 %>
+  <% unless syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == '' %>
       <li><label>课程性质：</label><%=syllabus.syllabus_type_str %></li>
   <% end %>
   <% unless syllabus.credit.nil? || syllabus.credit == '' %>
@@ -26,7 +26,7 @@
       <li><label>先修课程：</label><%=syllabus.pre_course %></li>
   <% end %>
 
-  <% if syllabus.syllabus_type.nil? || syllabus.syllabus_type == '' %>
+  <% if syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == '' %>
       <li class="none none_attr"><label>课程性质：</label><span class="fontGrey3">空</span></li>
   <% end %>
   <% if syllabus.credit.nil? || syllabus.credit == '' %>
@@ -48,7 +48,7 @@
       <li class="none none_attr"><label>先修课程：</label><span class="fontGrey3">空</span></li>
   <% end %>
 </ul>
-<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%>
+<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%>
     <span class="homepageLeftMenuMore"><a href="javascript:void(0);" data-init="0" onclick="toggle_all_syllabus_attr();" class="homepageLeftMenuMoreIcon" id="show_all_syllabus_attr"></a></span>
 <% end %>
 <script>
diff --git a/app/views/syllabuses/_syllabus_course_list.html.erb b/app/views/syllabuses/_syllabus_course_list.html.erb
index 2667a2baa..fb85f76ea 100644
--- a/app/views/syllabuses/_syllabus_course_list.html.erb
+++ b/app/views/syllabuses/_syllabus_course_list.html.erb
@@ -23,7 +23,7 @@
               <li>
                 <span class="item_list fl"></span>
                 <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
                 <% teacher = User.where("id=?",course.tea_id).first%>
                 <span class="fr grayTxt">
                     <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
index ea8f3fc40..9013c41f4 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -20,7 +20,7 @@
               <li>
                 <span class="item_list fl"></span>
                 <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
                 <% teacher = User.where("id=?",course.tea_id).first%>
                 <span class="fr grayTxt">
                     <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index 7567f92cd..8e33696d6 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -74,7 +74,7 @@
                       <%=link_to '查看课程', syllabus_path(syllabus.id), :class => 'postOptionLink',:target =>'_blank', :title => '查看课程' %>
                     </li>
                     <% if User.current == syllabus.user %>
-                        <li><%=link_to '删除', delete_syllabus_syllabus_path(syllabus), :class => 'postOptionLink', :remote => 'true'%></li>
+                        <li><%=link_to '删除课程', delete_syllabus_syllabus_path(syllabus), :class => 'postOptionLink', :remote => 'true'%></li>
                     <% end %>
                   </ul>
                 </li>