From a5fa68c9289c7220a25e7901accc11e029999052 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 14 Dec 2015 16:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A0=8F=E7=9B=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb                      | 6 +++++-
 app/views/files/_upload_subfield_file.html.erb           | 6 ++----
 app/views/files/subfield_upload_file.js.erb              | 6 ++++++
 app/views/layouts/base_org.html.erb                      | 4 ++--
 app/views/organizations/_org_left_subfield_list.html.erb | 6 +++++-
 config/routes.rb                                         | 1 +
 public/stylesheets/org.css                               | 4 +++-
 7 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 app/views/files/subfield_upload_file.js.erb

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 6ed42bd6e..7b375377c 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -392,8 +392,8 @@ class FilesController < ApplicationController
         sort = "#{Attachment.table_name}.created_on desc"
       end
       @container_type = 2
-      @organization = Organization.find(params[:organization_id])
       @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+      @organization = Organization.find(@containers.first.organization_id)
       show_attachments @containers
       render :layout => 'base_org'
       # @subfield = params[:org_subfield_id]
@@ -733,4 +733,8 @@ class FilesController < ApplicationController
       # format.html
     end
   end
+
+  def subfield_upload_file
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+  end
 end
diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb
index c3ca72ecd..5d8723d03 100644
--- a/app/views/files/_upload_subfield_file.html.erb
+++ b/app/views/files/_upload_subfield_file.html.erb
@@ -10,7 +10,7 @@
           <!-- <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%>">
-          <%= render :partial => 'files/attachement_list',:locals => {:org_subfield => org_subfield} %>
+          <%= render :partial => 'files/attachement_list'%>
           <div class="cl"></div>
           <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
@@ -18,9 +18,7 @@
     </div>
 
   </div>
-  <% content_for :header_tags do %>
-      <%= javascript_include_tag 'attachments' %>
-  <% end %>
+
 </div>
 
 <script>
diff --git a/app/views/files/subfield_upload_file.js.erb b/app/views/files/subfield_upload_file.js.erb
new file mode 100644
index 000000000..fc3afc0ff
--- /dev/null
+++ b/app/views/files/subfield_upload_file.js.erb
@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>');
+showModal('ajax-modal', '513px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("popbox_polls");
\ No newline at end of file
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 4c33dcca5..93af3fd29 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -12,9 +12,9 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
+  <%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','courses','org' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%>
-
+  <%= javascript_include_tag 'attachments' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 152310bba..bcd8aa5f5 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -29,7 +29,11 @@
         <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
         <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
       <% else %>
-        <%= link_to "#{field.name}", org_subfield_files_path(field, :organization_id => organization.id), :class => "homepageMenuText" %>
+        <%= 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 => "上传资源" %>
+           <!--<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>-->
       <% end %>
     </div>
diff --git a/config/routes.rb b/config/routes.rb
index add6df3e4..05507d024 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,6 +78,7 @@ RedmineApp::Application.routes.draw do
         match "search_files_in_subfield",:via => [:post,:get]
         match "searchone4reload",:via => [:post,:get]
         match "search_tag_attachment", :via => [:post,:get]
+        match "subfield_upload_file", :via => :post
       end
       member do
         match "quote_resource_show", :via => [:get]
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 584f1bafa..44dcc70e3 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -83,4 +83,6 @@ a.linkGrey8:hover {color:#585858;}
 .re_con{ margin:5px; width:665px;}
 .re_con_top{color:#494949; }
 .re_con_top span{ color:#999999; font-weight:bold;}
-ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
\ No newline at end of file
+ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
+
+.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
\ No newline at end of file