Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou

app/controllers/files_controller.rb

@@ -623,6 +623,52 @@ class FilesController < ApplicationController
        @attachtype = 0
        @contenttype = 0
 
+       respond_to do |format|
+         format.js
+         # format.html {
+         #   redirect_to org_subfield_files_url(@org_subfield)
+         # }
+       end
+     elsif @organization
+       @addTag=false
+       attachments = Attachment.attach_filesex(@organization, params[:attachments], params[:org_attachment_type])
+
+       if params[:org_attachment_type] && params[:org_attachment_type].is_a?(Array)
+         params[:org_attachment_type].each do |type|
+           tag_name = get_tag_name_by_type_number  type
+           if !attachments.empty? && attachments[:files] && tag_name != ""
+             attachments[:files].each do |attachment|
+               attachment.tag_list.add(tag_name)
+               attachment.save
+             end
+           end
+         end
+       else
+         if params[:org_attachment_type] && params[:org_attachment_type] != "5"
+           tag_name = get_tag_name_by_type_number  params[:org_attachment_type]
+           if !attachments.empty? && attachments[:files] && tag_name != ""
+             attachments[:files].each do |attachment|
+               attachment.tag_list.add(tag_name)
+               attachment.save
+             end
+           end
+         end
+       end
+
+       # TODO: 临时用 nyan
+       sort_init 'created_on', 'desc'
+       sort_update 'created_on' => "#{Attachment.table_name}.created_on",
+                   'filename' => "#{Attachment.table_name}.filename",
+                   'size' => "#{Attachment.table_name}.filesize",
+                   'downloads' => "#{Attachment.table_name}.downloads"
+
+       @containers = [Organization.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@organization.id)]
+
+       show_attachments @containers
+       @tag_list = attachment_tag_list @all_attachments
+       @attachtype = 0
+       @contenttype = 0
+
        respond_to do |format|
          format.js
          # format.html {

app/models/attachment.rb

@@ -23,6 +23,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :project, foreign_key: 'container_id', conditions: "attachments.container_type = 'Project'"
   belongs_to :course, foreign_key: 'container_id', conditions: "attachments.container_type = 'Course'"
   belongs_to :org_subfield, foreign_key: 'container_id', conditions: "attachements.container_type = 'OrgSubfield'"
+  belongs_to :organization, foreign_key: 'container_id', conditions: "attachements.container_type = 'Organization'"
   belongs_to :softapplication, foreign_key: 'container_id', conditions: "attachments.container_type = 'Softapplication'"
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"

app/models/organization.rb

@@ -8,6 +8,8 @@ class Organization < ActiveRecord::Base
   has_many :org_courses, :dependent => :destroy
   has_many :org_subfields, :dependent => :destroy
   has_many :users, :through => :org_members
+  has_many :files
+  acts_as_attachable
   validates_uniqueness_of :name
   after_create :save_as_org_activity, :add_default_subfields
 

app/views/files/_upload_org_new_files.html.erb

@@ -0,0 +1,26 @@
+
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
+  <div class="upload_con">
+    <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
+    <div class="upload_box">
+      <%= error_messages_for 'attachment' %>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
+      <%= form_tag(organization_files_path(org, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
+          <%= render :partial => 'files/org_subfield_upload_attachment_list', :locals => {:container => org}%>
+          <div class="cl"></div>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_org_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+      <% end %>
+    </div>
+
+  </div>
+
+</div>
+
+<script>
+    function submit_resource()
+    {
+        $('#submit_org_resource').parent().submit();
+    }
+</script>

app/views/files/create.js.erb

@@ -65,6 +65,19 @@ $('#upload_file_div').slideToggle('slow');
 //                setTimeout( function(){div.remove();},3000);
 <% end %>
 <% end %>
+<% elsif @organization %>  //组织单独处理
+<% if params[:in_org] %>
+window.location.href = '<%= organization_files_path @organization %>';
+<%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);

app/views/layouts/base_org_newstyle.html.erb

@@ -9,8 +9,8 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'org_new_style' %>
+  <%= stylesheet_link_tag  'org_new_style','jquery/jquery-ui-1.9.2' %>
-  <%= javascript_include_tag 'org' %>
+  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
   <%= javascript_include_tag 'attachments' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
@@ -59,13 +59,25 @@
   </script>
 
 </head>
+
 <!--add by huang-->
+<script type="text/javascript">
+    function orge_new_files_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_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","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+</script>
 <body onload="prettyPrint();">
 <div class="cl"></div>
 <div class="container">
   <div class="header">
     <div class="header-con">
-      <span  class="fl logo"><img src="/images/org_new_style/logo.jpg" alt=""/></span>
+      <a href="javascript:void(0);" class="fl logo" onclick="orge_new_files_upload();"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
       <%# 登录 %>
       <%= render :partial => 'organizations/org_logined_header' %>
     </div>

config/routes.rb

@@ -46,6 +46,14 @@ RedmineApp::Application.routes.draw do
     end
   end
   resources :organizations do
+    resource :files do
+      member do
+
+      end
+      collection do
+
+      end
+    end
     resources :org_document_comments do
       member do