From cc0c50d2ed4171b3aa9d7e1aec85138fb71f9317 Mon Sep 17 00:00:00 2001 From: Casper Peter Lotter Date: Thu, 9 Oct 2008 22:00:21 +0200 Subject: [PATCH] Added debugger for development environment. Moved custom error attachment code to Domain model [#35] --- app/controllers/domains_controller.rb | 10 ++-------- app/models/domain.rb | 6 ++++++ config/environments/development.rb | 8 ++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) mode change 100644 => 100755 app/models/domain.rb mode change 100644 => 100755 config/environments/development.rb diff --git a/app/controllers/domains_controller.rb b/app/controllers/domains_controller.rb index 75852e36..874d06c3 100755 --- a/app/controllers/domains_controller.rb +++ b/app/controllers/domains_controller.rb @@ -34,7 +34,7 @@ def create begin @domain = @zone_template.build( params[:domain][:name] ) rescue ActiveRecord::RecordInvalid => e - @domain = attach_errors(@domain , e) + @domain.attach_errors(e) end end @domain.user = current_user unless current_user.has_role?( 'admin' ) @@ -92,11 +92,5 @@ def change_owner def restrict_token_movements redirect_to domain_path( current_token.domain ) if current_token end - - def attach_errors(domain , e) - e.message.split(":")[1].split(",").uniq.each do |m| - domain.errors.add(m , '') - end - domain - end + end diff --git a/app/models/domain.rb b/app/models/domain.rb old mode 100644 new mode 100755 index f1bbbf41..179c3b6d --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -119,4 +119,10 @@ def after_create #:nodoc: soa.serial = serial unless serial.nil? # Optional soa.save end + + def attach_errors(e) + e.message.split(":")[1].split(",").uniq.each do |m| + self.errors.add(m , '') + end + end end diff --git a/config/environments/development.rb b/config/environments/development.rb old mode 100644 new mode 100755 index 1de62b95..e9244d3d --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -16,3 +16,11 @@ # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false + +begin + require "ruby-debug" +rescue LoadError + puts "+---------------------------------------------------+" + puts "| ruby-debug gem not installed, #debugger will fail |" + puts "+---------------------------------------------------+" +end