From 0bbdf854919a5661b602cd4eafbbd5b28e3cd191 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 6 May 2016 10:55:24 +0800
Subject: [PATCH] =?UTF-8?q?more=E6=B7=BB=E5=8A=A0=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_link_subfield_more.html.erb  | 9 +++++++++
 app/views/organizations/_org_subfield_leftD.html.erb  | 4 +++-
 app/views/organizations/_org_subfield_leftM1.html.erb | 8 +++++---
 app/views/organizations/_org_subfield_leftMD.html.erb | 8 +++++---
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 app/views/organizations/_link_subfield_more.html.erb

diff --git a/app/views/organizations/_link_subfield_more.html.erb b/app/views/organizations/_link_subfield_more.html.erb
new file mode 100644
index 000000000..cb4a82ed1
--- /dev/null
+++ b/app/views/organizations/_link_subfield_more.html.erb
@@ -0,0 +1,9 @@
+<% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
+    <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+        <%= link_to "更多", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more" , :target => "_blank"  %>
+    <% else %>
+        <%= link_to "更多", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more" , :target => "_blank"  %>
+    <% end %>
+<% else %>
+    <%= link_to "更多", organization_path(@organization, :org_subfield_id => field.id), :class => "more" , :target => "_blank"  %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftD.html.erb b/app/views/organizations/_org_subfield_leftD.html.erb
index 595b3c299..6af0e9f60 100644
--- a/app/views/organizations/_org_subfield_leftD.html.erb
+++ b/app/views/organizations/_org_subfield_leftD.html.erb
@@ -10,7 +10,9 @@
         <% org_acts = get_subfield_acts field %>
         <% unless org_acts.blank? %>
             <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-              <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+              <h2 class="h2-title"><%= field.name %>
+                <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+              </h2>
               <div class="sn-index-partnerbox " >
                 <ul id="scrollPic" >
                   <div class="scroll-control">
diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb
index 45212d725..ec9523131 100644
--- a/app/views/organizations/_org_subfield_leftM1.html.erb
+++ b/app/views/organizations/_org_subfield_leftM1.html.erb
@@ -7,7 +7,7 @@
             <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
-            <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+            <h2 class="h2-title"><%= field.name %></h2>
             <div class="cl"></div>
             <% @course_acts.first(1).each do |act| %>
                 <% if act.org_act_type == "HomeworkCommon" %>
@@ -99,7 +99,7 @@
             <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
-            <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+            <h2 class="h2-title"><%= field.name %></h2>
             <div class="cl"></div>
             <% @project_acts.first(1).each do |act| %>
                 <% if act.org_act_type == "Issue" %>
@@ -169,7 +169,9 @@
             <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
-            <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+            <h2 class="h2-title"><%= field.name %>
+              <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+            </h2>
             <div class="cl"></div>
             <% org_acts.first(1).each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb
index 773c8b336..1b1349c30 100644
--- a/app/views/organizations/_org_subfield_leftMD.html.erb
+++ b/app/views/organizations/_org_subfield_leftMD.html.erb
@@ -12,7 +12,7 @@
               </div>
           <% else %>
               <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-                <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+                <h2 class="h2-title"><%= field.name %></h2>
                 <div class="sn-index-resourcescon">
                   <% @course_acts.first(4).each do |act| %>
                       <% if act.org_act_type == "HomeworkCommon" %>
@@ -112,7 +112,7 @@
               </div>
           <% else %>
               <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-                <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+                <h2 class="h2-title"><%= field.name %></h2>
                 <div class="sn-index-resourcescon">
                   <% @project_acts.first(4).each do |act| %>
                       <% if act.org_act_type == "Issue" %>
@@ -191,7 +191,9 @@
               </div>
           <% else %>
               <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-                <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+                <h2 class="h2-title"><%= field.name %>
+                  <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+                </h2>
                 <div class="sn-index-resourcescon">
                   <% org_acts.first(4).each do |activity| %>
                       <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>