From 3efb36a28e69cdf0685ce6ed187dd6a714713943 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 15 Dec 2015 09:59:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BB=84=E7=BB=87=E9=9D=9E=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=A0=8F=E7=9B=AE=E9=A1=B5=E9=9D=A2=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E6=BA=90=E5=90=8E=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=87=B3=E8=B5=84=E6=BA=90=E6=A0=8F=E7=9B=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb           |  6 ++---
 .../files/_upload_subfield_file.html.erb      |  2 +-
 app/views/files/create.js.erb                 | 22 ++++++++++---------
 .../_org_left_subfield_list.html.erb          |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 7b375377c..15195c64f 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -549,9 +549,9 @@ class FilesController < ApplicationController
 
        respond_to do |format|
          format.js
-         format.html {
-           redirect_to org_subfield_files_url(@org_subfield)
-         }
+         # format.html {
+         #   redirect_to org_subfield_files_url(@org_subfield)
+         # }
        end
      end
    end
diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb
index 5d8723d03..dd90ec173 100644
--- a/app/views/files/_upload_subfield_file.html.erb
+++ b/app/views/files/_upload_subfield_file.html.erb
@@ -6,7 +6,7 @@
       <%= error_messages_for 'attachment' %>
       <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
 
-      <%= form_tag(org_subfield_files_path(org_subfield), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+      <%= 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">-->
           <input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type%>">
diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 4d8bb26ca..c3399d9da 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -53,16 +53,18 @@ $('#upload_file_div').slideToggle('slow');
         <% end %>
     <%end%>
     <% elsif @org_subfield %>
-        hideModal();
-        $("#resource_list").html('<%= j(render partial:  "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
-//        $("#courses_files_count_info").html("<%#= @all_attachments.count%>");
-//        $("#courses_files_count_nav").html("(<%#= @all_attachments.count%>)")
-        //    添加文件上传成功提示,
-        <% unless params[:attachments].nil? %>
-            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
-            $("#org_subfield_list").prepend(div);
-            setTimeout( function(){div.remove();},3000)
-        <% end %>
+       <% if params[:in_org] %>
+            window.location.href = '<%= org_subfield_files_path @org_subfield %>';
+       <%else %>
+            hideModal();
+            $("#resource_list").html('<%= j(render partial:  "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
+            //    添加文件上传成功提示,
+            <% unless params[:attachments].nil? %>
+                var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+                $("#org_subfield_list").prepend(div);
+                setTimeout( function(){div.remove();},3000);
+            <% end %>
+       <% end %>
   <% end %>
 <% end %>
 $(document).ready(img_thumbnails);
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index bcd8aa5f5..4d85342a6 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -31,7 +31,7 @@
       <% else %>
         <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
         <% if User.current.member_of_org?organization %>
-          <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
+          <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
            <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
         <% end %>
           <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->