diff options
| -rw-r--r-- | app/controllers/routes_controller.rb | 3 | ||||
| -rw-r--r-- | lib/stif/codif_line_synchronization.rb | 10 | ||||
| -rw-r--r-- | lib/stif/reflex_synchronization.rb | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb index 5a73d397c..73febc4b9 100644 --- a/app/controllers/routes_controller.rb +++ b/app/controllers/routes_controller.rb @@ -46,9 +46,6 @@ class RoutesController < ChouetteController end end - # overwrite inherited resources to use delete instead of destroy - # foreign keys will propagate deletion) - def destroy destroy! do |success, failure| success.html { redirect_to referential_line_path(@referential,@line) } diff --git a/lib/stif/codif_line_synchronization.rb b/lib/stif/codif_line_synchronization.rb index feb313f45..2bb4d8778 100644 --- a/lib/stif/codif_line_synchronization.rb +++ b/lib/stif/codif_line_synchronization.rb @@ -11,18 +11,18 @@ module Stif def processed_counts { - imported: self.imported_count, - updated: self.updated_count, - deleted: self.deleted_count + imported: imported_count, + updated: updated_count, + deleted: deleted_count } end def increment_counts prop_name, value - self.send("#{prop_name}=", self.send(prop_name) + value) + send("#{prop_name}=", self.send(prop_name) + value) end def synchronize - self.reset_counts + reset_counts start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :second) # Fetch Codifline data client = Codifligne::API.new diff --git a/lib/stif/reflex_synchronization.rb b/lib/stif/reflex_synchronization.rb index 6d8497bce..675486265 100644 --- a/lib/stif/reflex_synchronization.rb +++ b/lib/stif/reflex_synchronization.rb @@ -35,7 +35,7 @@ module Stif end def synchronize - self.reset_counts + reset_counts ['getOR', 'getOP'].each do |method| start = Time.now results = Reflex::API.new().process(method) |