aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorLuc Donnet2018-05-02 15:44:35 +0200
committerGitHub2018-05-02 15:44:35 +0200
commitfca877efdd8087959f721c2bb4af2d018e3e910a (patch)
tree2255bd67ac90476d137245e2f70d4df3c1802871 /app
parent8631ff6b59439b9086f7cea2edf264f1fd305725 (diff)
parent979fc1c749282a97407bc5e000103f994a28ce73 (diff)
downloadchouette-core-fca877efdd8087959f721c2bb4af2d018e3e910a.tar.bz2
Merge pull request #546 from af83/6572-make-new-referentials-pending
6572 Create Referentials in a pending state
Diffstat (limited to 'app')
-rw-r--r--app/controllers/referentials_controller.rb1
-rw-r--r--app/models/referential.rb5
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 8addfbc32..80f954cde 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -136,7 +136,6 @@ class ReferentialsController < ChouetteController
def create_resource(referential)
referential.organisation = current_organisation
- referential.ready = true
super
end
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 933bc78e3..b4f64fad1 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -59,7 +59,6 @@ class Referential < ApplicationModel
belongs_to :referential_suite
-
scope :pending, -> { where(ready: false, failed_at: nil, archived_at: nil) }
scope :active, -> { where(ready: true, failed_at: nil, archived_at: nil) }
scope :failed, -> { where.not(failed_at: nil) }
@@ -271,7 +270,8 @@ class Referential < ApplicationModel
stop_area_referential: from.stop_area_referential,
created_from: from,
objectid_format: from.objectid_format,
- metadatas: from.metadatas.map { |m| ReferentialMetadata.new_from(m, organisation) }
+ metadatas: from.metadatas.map { |m| ReferentialMetadata.new_from(m, organisation) },
+ ready: false
)
end
@@ -471,6 +471,7 @@ class Referential < ApplicationModel
end
def destroy_schema
+ return unless ActiveRecord::Base.connection.schema_names.include?(slug)
Apartment::Tenant.drop slug
end