send resource to org

dev_zanle
lizanle 10 years ago
parent 1103e7eab4
commit 659f322ca2

@ -1617,12 +1617,12 @@ class UsersController < ApplicationController
@flag = true @flag = true
if params[:send_id].present? if params[:send_id].present?
send_id = params[:send_id] send_id = params[:send_id]
subfield_id = params[:subfield_id] subfield_id = params[:subfield]
if subfield_id.nil? if subfield_id.nil?
@flag = false @flag = false
end end
ori = Attachment.find_by_id(send_id) ori = Attachment.find_by_id(send_id)
unless org_id.nil? unless subfield_id.nil?
attach_copied_obj = ori.copy attach_copied_obj = ori.copy
attach_copied_obj.tag_list.add(ori.tag_list) # tag关联 attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
attach_copied_obj.container = OrgSubfield.find(subfield_id) attach_copied_obj.container = OrgSubfield.find(subfield_id)
@ -1635,33 +1635,31 @@ class UsersController < ApplicationController
end end
elsif params[:send_ids].present? elsif params[:send_ids].present?
send_ids = params[:send_ids].split(" ") send_ids = params[:send_ids].split(" ")
project_ids = params[:projects_ids] subfield_id = params[:subfield]
if project_ids.nil? if subfield_id.nil?
@flag = false @flag = false
end end
send_ids.each do |send_id| send_ids.each do |send_id|
ori = Attachment.find_by_id(send_id) ori = Attachment.find_by_id(send_id)
unless project_ids.nil? unless subfield_id.nil?
project_ids.each do |project_id|
next if ori.blank? next if ori.blank?
attach_copied_obj = ori.copy attach_copied_obj = ori.copy
attach_copied_obj.tag_list.add(ori.tag_list) # tag关联 attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
attach_copied_obj.container = Project.find(project_id) attach_copied_obj.container = OrgSubfield.find(subfield_id)
attach_copied_obj.created_on = Time.now attach_copied_obj.created_on = Time.now
attach_copied_obj.author_id = User.current.id attach_copied_obj.author_id = User.current.id
if attach_copied_obj.attachtype == nil if attach_copied_obj.attachtype == nil
attach_copied_obj.attachtype = 1 attach_copied_obj.attachtype = 1
end end
attach_copied_obj.save attach_copied_obj.save
end
end end
end end
else else
@flag=true @flag=true
end end
user_course_ids = User.current.courses.map { |c| c.id} #我的资源库的话,那么应该是我上传的所有资源 加上 我加入的课程的所有资源 user_course_ids = User.current.courses.map { |c| c.id} #我的资源库的话,那么应该是我上传的所有资源 加上 我加入的课程的所有资源
@attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
"or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc") "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
@type = params[:type] @type = params[:type]
@limit = 25 @limit = 25

@ -19,6 +19,8 @@
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<%= form_tag add_exist_file_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %> <%= form_tag add_exist_file_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
<%= hidden_field_tag(:send_id, send_id) %>
<%= hidden_field_tag(:send_ids, send_ids) %>
<div class="sectionWrap fl mr15"> <div class="sectionWrap fl mr15">
<ul class="fontGrey3 sectionContent"> <ul class="fontGrey3 sectionContent">
<% unless @orgs.empty? %> <% unless @orgs.empty? %>

Loading…
Cancel
Save