From 2518305959e7cb74cf3be288ef1bc192b7459df3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 9 Oct 2015 16:12:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=A0=E9=99=A4=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E4=BF=AE=E6=94=B9=EF=BC=9B=E9=A1=B9=E7=9B=AE=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 12 ++++--------
 app/views/admin/projects.html.erb      | 10 +++++++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a8a302045..90974b376 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -659,14 +659,10 @@ class ProjectsController < ApplicationController
   # Delete @project
   def destroy
     @project_to_destroy = @project
-    if api_request? || params[:confirm]
-      @project_to_destroy.destroy
-      respond_to do |format|
-        format.html { redirect_to admin_projects_url }
-        format.api  { render_api_ok }
-      end
-    else
-      render :layout => "base_projects"
+    @project_to_destroy.destroy
+    respond_to do |format|
+      format.html { redirect_to admin_projects_url }
+      format.api  { render_api_ok }
     end
     # hide project in layout
     @project = nil
diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb
index f5b7955bf..3f6ee36f0 100644
--- a/app/views/admin/projects.html.erb
+++ b/app/views/admin/projects.html.erb
@@ -65,7 +65,7 @@
             <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %>
             <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %>
             <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
-            <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
+            <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del', :onClick=>"delcfm()" ) %>
           </td>
         </tr>
     <% end %>
@@ -74,3 +74,11 @@
 </div>
 
 <% html_title(l(:label_project_plural)) -%>
+
+<script>
+    function delcfm() {
+        if (!confirm("删除项目会一并删除项目的关联信息，确认要删除吗？")) {
+            window.event.returnValue = false;
+        }
+    }
+</script>
\ No newline at end of file