From 2bf312f0b01acdd187d8fe56224c5f1f1fdbf2c5 Mon Sep 17 00:00:00 2001 From: Sungmin Kim Date: Tue, 4 Feb 2014 18:52:53 +0900 Subject: [PATCH] Fixed remove server that has dependency. Signed-off-by: Sungmin Kim Change-Id: I7a785117eb93bc6e15be8d44d8ae6e3e83a39435 --- dibs-web/app/controllers/admin_server_controller.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dibs-web/app/controllers/admin_server_controller.rb b/dibs-web/app/controllers/admin_server_controller.rb index 5136382..28640b2 100644 --- a/dibs-web/app/controllers/admin_server_controller.rb +++ b/dibs-web/app/controllers/admin_server_controller.rb @@ -250,17 +250,8 @@ class AdminServerController < ApplicationController return end - # remove job info - jobs = Job.find(:all, :conditions => ["remote_build_server_id=?", id]) - - if not jobs.nil? then - # remove job_timestamps table - jobs.each do |job| - jobTimestamp = JobTimestamp.delete_all(["job_id=?", job.id]) - job.destroy - end - - end + # update job info + Job.where(:remote_build_server_id => id).update_all(:remote_build_server_id => nil) server.destroy render :json => { :success => "OK!" } -- 2.34.1