Created a delete project method that the project_controller method uses now.

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb
index 24b1d8aa46ead14a42fd8125170b35f3d6323cd4..00760a18bf816fa3245d27a427e481f1d12ad382 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb
@@ -98,8 +98,7 @@ class ProjectController < ApplicationController
     if params[:id]
       @project = Project.by_key(params[:id])
       if @project && is_admin?(@project)
-        Snapshot.update_all(['islast=?', false], ['(root_project_id=? OR project_id=?) AND islast=?', @project.id, @project.id, true])
-        Project.delete_all(['id=? OR root_id=? or copy_resource_id=?', @project.id, @project.id, @project.id])
+        Project.delete_project(@project)
       end
     end
     redirect_to_default

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/project.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/project.rb
index 9658c9dfcb31d38926fed2a961eccf4d0b96b1e8..a182dd8b876ab16fed50e7d2826e7273045115ba 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/project.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/project.rb
@@ -38,6 +38,11 @@ class Project < ActiveRecord::Base
       Project.find(:first, :conditions => {:kee => k})
     end
   end
+
+  def self.delete_project(project)
+      Snapshot.update_all(['islast=?', false], ['(root_project_id=? OR project_id=?) AND islast=?', project.id, project.id, true])
+      Project.delete_all(['id=? OR root_id=? or copy_resource_id=?', project.id, project.id, project.id])
+  end
   
   def project
     root||self