Merge branch 'master' of github.com:af83/stif-boiv

2 files changed, 16 insertions, 8 deletions

diff --git a/app/controllers/api_keys_controller.rb b/app/controllers/api_keys_controller.rb
index 7059cf52e..03e5ef237 100644
--- a/app/controllers/api_keys_controller.rb
+++ b/app/controllers/api_keys_controller.rb
@@ -3,19 +3,27 @@ class ApiKeysController < BreadcrumbController
 
   def create
     @api_key = Api::V1::ApiKey.new(api_key_params.merge(organisation: current_organisation))
-    create! { organisation_api_keys_path }
-  end
-
-  def index
-    @api_keys = decorate_api_keys(current_organisation.api_keys.paginate(page: params[:page]))
+    create! do |format|
+      format.html {
+        redirect_to workbenches_path
+      }
+    end
   end
 
   def update
-    update! { organisation_api_key_path(resource) }
+    update! do |format|
+      format.html {
+        redirect_to workbenches_path
+      }
+    end
   end
 
   def destroy
-    destroy! { organisation_api_keys_path }
+    destroy! do |format|
+      format.html {
+        redirect_to workbenches_path
+      }
+    end
   end
 
   private
diff --git a/app/controllers/referential_lines_controller.rb b/app/controllers/referential_lines_controller.rb
index 1da64991d..ec0bbbb18 100644
--- a/app/controllers/referential_lines_controller.rb
+++ b/app/controllers/referential_lines_controller.rb
@@ -11,7 +11,7 @@ class ReferentialLinesController < ChouetteController
   belongs_to :referential
 
   def show
-    @routes = resource.routes
+    @routes = resource.routes.order(:objectid)
 
     case sort_route_column
     when "stop_points", "journey_patterns"