From d9df926c2b32da9ce8472e51b13d56847100d8d9 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 15 Dec 2015 10:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE/=E7=BB=84=E7=BB=87=E5=BC=B9=E7=AA=97=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=E5=90=8E=EF=BC=8C=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=BC=B9=E7=AA=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb                |  3 +--
 app/views/files/_upload_subfield_file.html.erb     | 14 ++++++++++++--
 app/views/organizations/_join_course_menu.html.erb |  2 +-
 .../organizations/_join_project_menu.html.erb      |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 15195c64f..8597ad3b7 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -539,8 +539,7 @@ class FilesController < ApplicationController
                    'size' => "#{Attachment.table_name}.filesize",
                    'downloads' => "#{Attachment.table_name}.downloads"
 
-       @containers = [OrgSubfield.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@org_subfield.id)] #modify by Long Jun
-       # @containers += @org_subfield.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+       @containers = [OrgSubfield.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@org_subfield.id)]
 
        show_attachments @containers
 
diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb
index dd90ec173..567309f9c 100644
--- a/app/views/files/_upload_subfield_file.html.erb
+++ b/app/views/files/_upload_subfield_file.html.erb
@@ -7,8 +7,18 @@
       <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
 
       <%= form_tag(org_subfield_files_path(org_subfield, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
-          <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
-          <!--<input type="hidden" name="in_org_subfield_toolbar" value="Y">-->
+          <!--<%# if params[:in_org] %>-->
+              <!--<div class="c_dark">-->
+                <!--<input name="org_subfield_attachment_type[]" type="radio" value="1" checked class="c_dark" >课件</input>&nbsp;<span class="c_grey">|</span>&nbsp;-->
+                <!--<input name="org_subfield_attachment_type[]" type="radio" value="2" class="c_dblue">软件</input>&nbsp;<span  class="c_grey">|</span>&nbsp;-->
+                <!--<input name="org_subfield_attachment_type[]" type="radio" value="3" class="c_dblue">媒体</input>&nbsp;<span  class="c_grey">|</span>&nbsp;-->
+                <!--<input name="org_subfield_attachment_type[]" type="radio" value="4" class="c_dblue">代码</input>&nbsp;<span  class="c_grey">|</span>&nbsp;-->
+                <!--<input name="org_subfield_attachment_type[]" type="radio" value="6" class="c_dblue">论文</input>&nbsp;<span  class="c_grey">|</span>&nbsp;-->
+                <!--<input name="org_subfield_attachment_type[]" type="radio" value="5" class="c_dblue">其他</input></a>-->
+              <!--</div>-->
+          <!--<%# else %>-->
+              <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
+          <!--<%# end %>-->
           <input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type%>">
           <%= render :partial => 'files/attachement_list'%>
           <div class="cl"></div>
diff --git a/app/views/organizations/_join_course_menu.html.erb b/app/views/organizations/_join_course_menu.html.erb
index fa507db28..08488d6cd 100644
--- a/app/views/organizations/_join_course_menu.html.erb
+++ b/app/views/organizations/_join_course_menu.html.erb
@@ -33,7 +33,7 @@
       <div class="courseSendSubmit">
         <a href="javascript:void(0);" onclick="org_join_courses(<%= organization_id %>);" class="sendSourceText">关联</a>
       </div>
-      <div class="courseSendCancel"><a href="javascript:void(0);" onclick="cancel_join_courses();" class="sendSourceText">取消</a></div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a></div>
     <% end %>
   </div>
 
diff --git a/app/views/organizations/_join_project_menu.html.erb b/app/views/organizations/_join_project_menu.html.erb
index a491d8788..20b04ab34 100644
--- a/app/views/organizations/_join_project_menu.html.erb
+++ b/app/views/organizations/_join_project_menu.html.erb
@@ -33,7 +33,7 @@
         <div class="courseSendSubmit">
           <a href="javascript:void(0);" onclick="org_join_projects(<%= organization_id %>);" class="sendSourceText">关联</a>
         </div>
-        <div class="courseSendCancel"><a href="javascript:void(0);" onclick="cancel_join_projects();" class="sendSourceText">取消</a></div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a></div>
     <% end %>
   </div>
   <div class="cl"></div>