From 39434766e3cd18ae9cf964af15d8307ab96ae2b8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 10 Jul 2014 16:35:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=B6=85=E7=BA=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AE=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E7=9A=84BUG=202.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E6=8F=8F=E8=BF=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/bids_controller.rb | 2 +-
 app/models/course.rb               | 3 ++-
 app/views/courses/_course.html.erb | 8 ++++++--
 app/views/courses/index.html.erb   | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index a728ee6e2..b9f9245c8 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -449,7 +449,7 @@ class BidsController < ApplicationController
   # 显示作业课程
   # add by nwb
   def show_courseEx
-    if (User.current.logged? && User.current.member_of_course?(@bid.courses.first))
+    if (User.current.logged? && (User.current.member_of_course?(@bid.courses.first) || User.current.admin?))
       # flash[:notice] = ""
       @membership = User.current.coursememberships.all(:conditions => Course.visible_condition(User.current))
 
diff --git a/app/models/course.rb b/app/models/course.rb
index 5034ab0d8..bac28e4c2 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -92,7 +92,8 @@ class Course < ActiveRecord::Base
 
   # 课程的短描述信息
   def short_description(length = 255)
-    description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+    description.gsub(/<\/?.*?>/,"").strip if description
+    #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
   end
 
   def extra_frozen?
diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb
index ef8f37566..6b720229a 100644
--- a/app/views/courses/_course.html.erb
+++ b/app/views/courses/_course.html.erb
@@ -16,7 +16,7 @@
 		<%= content_tag('span', "#{l(:label_institution_name)}:", :class => "course-font")%>
 		<% @admin = @course.course_infos%>
 		<%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%>
-		   <!-- <%= @admin.first.user.user_extensions.occupation %> -->
+		   <!-- <%#= @admin.first.user.user_extensions.occupation %> -->
 		   <% unless @course.teacher.user_extensions.school.nil? %>
 		   <%= link_to @course.teacher.user_extensions.school.try(:name), school_course_list_path(@course.teacher.user_extensions.school) %>
 		   <% end %>
@@ -28,7 +28,7 @@
 		   <%= content_tag('a', @admin.collect{|u| link_to(u.user.lastname+u.user.firstname, user_path(u.user_id))}.join(", ").html_safe)  %>
 		<% end %>
 	</p>
-	
+
 </div>
 
 <div class="information_for_course" >
@@ -76,6 +76,10 @@
 
 <div class="add-info" style="margin-left: 30px; margin-top: -20px">
 	<%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
+    <%# desc =  course.short_description.nil? ? "" : course.short_description%>
+    <!--<#div class="brief_introduction" title="<%#= desc.html_safe%>">
+      <%#= desc.html_safe%>
+    </div>-->
 	<%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
 </div>
 
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index db94cf6c5..0586262e9 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -35,6 +35,8 @@
 <div id="courses-index">
   <%if @courses%>
       <%= render_course_hierarchy(@courses)%>
+      <%#= render :partial => 'course', :locals => {:course => @courses.first}%>
+      <%#= "<a herf = 'aaa'>hello</a>".html_safe  %>
   <%end%>
 </div>