diff options
| author | Xinhui | 2016-09-30 11:33:54 +0200 |
|---|---|---|
| committer | Xinhui | 2016-09-30 11:33:54 +0200 |
| commit | dca3de5b0162c374622b17e0893c4360a025c55a (patch) | |
| tree | 3386afb3938b1ec512a570d04adc239bd6148cae /app/models | |
| parent | 5a6efc44dd862384b80f6ff48583e9f9229dbaf4 (diff) | |
| download | chouette-core-dca3de5b0162c374622b17e0893c4360a025c55a.tar.bz2 | |
Refactoring i18n & templating
Refs #1712
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/line_referential.rb | 2 | ||||
| -rw-r--r-- | app/models/line_referential_sync.rb | 3 | ||||
| -rw-r--r-- | app/models/stop_area_referential_sync.rb | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb index eb519a727..f33934dfc 100644 --- a/app/models/line_referential.rb +++ b/app/models/line_referential.rb @@ -7,7 +7,7 @@ class LineReferential < ActiveRecord::Base has_many :companies, class_name: 'Chouette::Company' has_many :networks, class_name: 'Chouette::Network' - has_many :line_referential_syncs, -> { order(created_at: :desc) } + has_many :line_referential_syncs def add_member(organisation, options = {}) attributes = options.merge organisation: organisation diff --git a/app/models/line_referential_sync.rb b/app/models/line_referential_sync.rb index 187e69967..03fea6a97 100644 --- a/app/models/line_referential_sync.rb +++ b/app/models/line_referential_sync.rb @@ -1,13 +1,14 @@ class LineReferentialSync < ActiveRecord::Base include AASM belongs_to :line_referential - has_many :line_referential_sync_messages, -> { order(created_at: :desc) }, :dependent => :destroy + has_many :line_referential_sync_messages, :dependent => :destroy after_commit :perform_sync, :on => :create validate :multiple_process_validation, :on => :create private def perform_sync + create_sync_message :info, :new LineReferentialSyncWorker.perform_async(self.id) end diff --git a/app/models/stop_area_referential_sync.rb b/app/models/stop_area_referential_sync.rb index ac5f09e93..ad99dbb8c 100644 --- a/app/models/stop_area_referential_sync.rb +++ b/app/models/stop_area_referential_sync.rb @@ -1,13 +1,14 @@ class StopAreaReferentialSync < ActiveRecord::Base include AASM belongs_to :stop_area_referential - has_many :stop_area_referential_sync_messages, -> { order(created_at: :desc) }, :dependent => :destroy + has_many :stop_area_referential_sync_messages, :dependent => :destroy after_commit :perform_sync, :on => :create validate :multiple_process_validation, :on => :create private def perform_sync + create_sync_message :info, :new StopAreaReferentialSyncWorker.perform_async(self.id) end |