From fa2437cdf636e7393de0192e8614201a2737f0f3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 14:28:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=BE=E7=A8=8B=E5=AD=A6?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/organizations_helper.rb              | 16 ++++++++++++++++
 .../organizations/_org_custom_left2.html.erb     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index aaaf05d21..2c8c24b39 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -247,4 +247,20 @@ module OrganizationsHelper
     org.org_subfields.where(:field_type => "Compstu").first.hide
   end
 
+  #当前学期(2015春季学期)
+  def current_time_and_term course
+    str = ""
+    term = cur_course_term
+    if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
+      str = course.time.to_s + course.term.to_s
+    elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
+      str = course.time.to_s + course.term.to_s
+    elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
+      str = course.end_time.to_s + course.end_term.to_s
+    else
+      str = Time.now.year.to_s + cur_course_term.to_s
+    end
+    str
+  end
+
 end
diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 16e22a1f2..53169506e 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -202,7 +202,7 @@
                   <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title link-black", :title => course.name %>
                   <%= link_to image_tag(url_to_avatar(course),:width => "140", :height => "100"), course_path(course), :target => "_blank", :class => "fl" %>
                   <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => course.id, :content=> course.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %>
-                  <span class=" por_course_time"><%= time_from_now course.updated_at %></span>
+                  <span class=" por_course_time"><%= current_time_and_term course %></span>
                 </div>
             <% end %>
         <% end %>