From 5d819625c00f5fa8ec42267c33c59eedc8ed99b5 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 8 Jan 2016 20:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E8=8F=9C=E5=8D=95=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E4=BD=BF=E7=94=A8=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8A=E4=BC=A0=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb      | 2 +-
 app/views/files/upload_files_menu.js.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index c6773ef57..bca9de22b 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -826,6 +826,6 @@ class FilesController < ApplicationController
   end
 
   def upload_files_menu
-    p 1
+
   end
 end
diff --git a/app/views/files/upload_files_menu.js.erb b/app/views/files/upload_files_menu.js.erb
index 3e44f5644..e083fac85 100644
--- a/app/views/files/upload_files_menu.js.erb
+++ b/app/views/files/upload_files_menu.js.erb
@@ -1,5 +1,5 @@
 <% if @project %>
-    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/upload_project_files_on_navbar',:locals => {:container => @project}) %>');
+    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_project_files',:locals => {:project => @project,:project_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>");