From 830e2d4fb49a8ab4d96dcdab2cc02779624e8d07 Mon Sep 17 00:00:00 2001
From: xianbo <xianbo@nudt.com>
Date: Tue, 1 Jul 2014 18:18:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=9A=90=E8=97=8F=20=E7=AB=99=E9=95=BF?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index c62a974d..ec751668 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -29,7 +29,7 @@
 </div>
 </div>
 </div>
-<div class="debug">
+<div class="debug hidden">
   <%= debug(params) if Rails.env.development? %>
 
   <script src="http://s4.cnzz.com/z_stat.php?id=1000482288&web_id=1000482288" language="JavaScript"></script>

From e1d9d6ab45dabfe78c7997b22ba4d8802736812d Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Tue, 1 Jul 2014 16:01:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?tag=E6=9F=A5=E8=AF=A2=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/tags_controller.rb               | 16 ++++++++--------
 ...140701075839_add_tag_type_index_to_tagging.rb |  5 +++++
 2 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20140701075839_add_tag_type_index_to_tagging.rb

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 4c0d9188..0216d529 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -256,14 +256,14 @@ class TagsController < ApplicationController
   
   # 获取有某类对象的tag总数
   def get_tags_size
-    @issues_tags_num = Issue.tag_counts.size
-    @projects_tags_num = Project.tag_counts.size
-    @users_tags_num = User.tag_counts.size
-    @bids_tags_num = Bid.tag_counts.size
-    forum_tags_num = Forum.tag_counts.size
-    attachment_tags_num = Attachment.tag_counts.size
-    @open_source_projects_num = OpenSourceProject.tag_counts.size
-    @contests_tags_num = Contest.tag_counts.size
+    @issues_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Issue").count
+    @projects_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Project").count
+    @users_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"User").count
+    @bids_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Bid").count
+    forum_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Forum").count
+    attachment_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Attachment").count
+    @open_source_projects_num =  ActsAsTaggableOn::Tagging.where(taggable_type:"OpenSourceProject").count
+    @contests_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Contest").count
     return @users_tags_num,@projects_tags_num,@issues_tags_num,@bids_tags_num, forum_tags_num, attachment_tags_num, @contests_tags_num, @open_source_projects_num
   end
   
diff --git a/db/migrate/20140701075839_add_tag_type_index_to_tagging.rb b/db/migrate/20140701075839_add_tag_type_index_to_tagging.rb
new file mode 100644
index 00000000..11a5b4ef
--- /dev/null
+++ b/db/migrate/20140701075839_add_tag_type_index_to_tagging.rb
@@ -0,0 +1,5 @@
+class AddTagTypeIndexToTagging < ActiveRecord::Migration
+  def change
+  	add_index :taggings, :taggable_type
+  end
+end

From 2b855badf9ae15ea9b5e8c07987d2f5bf662dd19 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Wed, 2 Jul 2014 09:11:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E5=85=B3=E8=81=94=E5=B7=B2=E6=9C=89?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb     | 29 +++++++++++++++++++
 .../add_exist_file_to_course.js.erb           | 17 +++++++++++
 app/views/files/_course_file.html.erb         |  2 +-
 config/routes.rb                              |  1 +
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 app/views/attachments/add_exist_file_to_course.js.erb

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 5dbb4f2b..af96d9c6 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -197,6 +197,35 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  def add_exist_file_to_course
+    class_id  = params[:class_id]
+    attachments = params[:attachment][:attach]
+
+    obj = Course.find_by_id(class_id)
+    attachments.collect do |attach_id|
+      ori = Attachment.find_by_id(attach_id)
+      next if ori.blank?
+      attach_copied_obj = ori.copy
+      attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+      attach_copied_obj.container = obj
+      attach_copied_obj.created_on = Time.now
+      attach_copied_obj.author_id = User.current.id
+      @obj = obj
+      @save_flag = attach_copied_obj.save
+      @save_message = attach_copied_obj.errors.full_messages
+    end
+
+    respond_to do |format|
+      format.js
+    end
+  rescue NoMethodError
+    @save_flag = false
+    @save_message = [] << l(:error_attachment_empty)
+    respond_to do |format|
+      format.js
+    end
+  end
+
 private
   def find_project
     @attachment = Attachment.find(params[:id])
diff --git a/app/views/attachments/add_exist_file_to_course.js.erb b/app/views/attachments/add_exist_file_to_course.js.erb
new file mode 100644
index 00000000..58e5690e
--- /dev/null
+++ b/app/views/attachments/add_exist_file_to_course.js.erb
@@ -0,0 +1,17 @@
+<% if @save_flag %>
+	window.location.reload();
+<% else %>
+	// alert('添加文件失败:\n<%=@save_message[0]%>');
+	$('#ajax-modal').html('<h3 class="title">添加文件失败</h3><%=@save_message.join(', ')%>');
+
+	var el = $('#ajax-modal').first();
+	var title = el.find('h3.title').text();
+	el.dialog({
+		width: '200px',
+		modal: true,
+		resizable: false,
+		dialogClass: 'modal',
+		title: title
+	});
+	
+<% end %>
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index c6f872d6..d9913539 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -40,7 +40,7 @@
             <%= text_field_tag(:attach_search) %>
             <%#= submit_tag("Search") %>
         <% end -%>
-        <%= form_tag attach_relation_path(:format => 'js'),
+        <%= form_tag course_attach_relation_path(:format => 'js'),
                      method: :post,
                      remote: true,
                      id: "relation_file_form",
diff --git a/config/routes.rb b/config/routes.rb
index ad493bce..2e11d9b4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -510,6 +510,7 @@ RedmineApp::Application.routes.draw do
   get 'attachments/autocomplete'
   match 'attachments/autocomplete', :to => 'attachments#autocomplete', via: [:post]
   post 'attachments/relationfile', to: 'attachments#add_exist_file_to_project', as: 'attach_relation'
+  post 'attachments/courserelationfile', to: 'attachments#add_exist_file_to_course', as: 'course_attach_relation'
   get  'attachments/renderTag/:attchmentId', :to => 'attachments#renderTag', :attchmentId => /\d+/
   resources :attachments, :only => [:show, :destroy]  do
     collection do