aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2015-05-22 11:40:23 +0200
committerLuc Donnet2015-05-22 11:40:23 +0200
commit0b7386600da8dcd9d081d9dce6ef96cd300c35e1 (patch)
treedf0cbec37c2ef498ed7dbca2eea11a04957a1cdf
parent04c4cbeb5d6a87e4c03a3bfc35da049d9d08f9d3 (diff)
parent1abe5c575fde03728d991805e4aaee6321a192b3 (diff)
downloadchouette-core-0b7386600da8dcd9d081d9dce6ef96cd300c35e1.tar.bz2
Merge branch 'rails4' of github.com:afimb/chouette2 into rails4
-rw-r--r--app/models/referential.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/referential.rb b/app/models/referential.rb
index baa1e9c87..d50694c60 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -20,17 +20,11 @@ class Referential < ActiveRecord::Base
attr_accessor :lower_corner
has_one :user
- ##has_many :rule_parameter_sets, :dependent => :destroy
- #has_many :import_tasks, :dependent => :destroy
- #has_many :compliance_check_tasks, :dependent => :destroy
- #has_many :exports, :dependent => :destroy
has_many :api_keys, :class_name => 'Api::V1::ApiKey', :dependent => :destroy
belongs_to :organisation
validates_presence_of :organisation
- #attr_accessible :data_format, :name, :prefix, :projection_type, :time_zone, :upper_corner, :lower_corner, :slug, :organisation
-
def slug_excluded_values
if ! slug.nil?
if slug.start_with? "pg_"
@@ -151,6 +145,12 @@ class Referential < ActiveRecord::Base
Apartment::Tenant.drop slug
end
+ before_destroy :destroy_jobs
+ def destroy_jobs
+ Ievkit.delete_jobs(slug)
+ true
+ end
+
def upper_corner
envelope.upper_corner
end