Merge branch 'breadcrumbs' into develop

2 files changed, 23 insertions, 2 deletions

diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb
index 0f4a02d..2437d8d 100644
--- a/app/controllers/call_routes_controller.rb
+++ b/app/controllers/call_routes_controller.rb
@@ -1,22 +1,25 @@
 class CallRoutesController < ApplicationController
   authorize_resource :call_route
-  before_filter :spread_breadcrumbs
 
   def index
     @call_routes = CallRoute.order([:routing_table, :position])
     @routing_tables = @call_routes.pluck(:routing_table).uniq.sort
+    spread_breadcrumbs
   end
 
   def show
     @call_route = CallRoute.find(params[:id])
+    spread_breadcrumbs
   end
 
   def new
     @call_route = CallRoute.new
+    spread_breadcrumbs
   end
 
   def create
     @call_route = CallRoute.new(call_route_parameter_params)
+    spread_breadcrumbs
     if @call_route.save
       redirect_to @call_route, :notice => t('call_routes.controller.successfuly_created')
     else
@@ -26,10 +29,12 @@ class CallRoutesController < ApplicationController
 
   def edit
     @call_route = CallRoute.find(params[:id])
+    spread_breadcrumbs
   end
 
   def update
     @call_route = CallRoute.find(params[:id])
+    spread_breadcrumbs
     if @call_route.update_attributes(call_route_parameter_params)
       redirect_to @call_route, :notice  => t('call_routes.controller.successfuly_updated')
     else
@@ -61,7 +66,7 @@ class CallRoutesController < ApplicationController
   def spread_breadcrumbs
     add_breadcrumb t("call_routes.index.page_title"), call_routes_path
     if @call_route && !@call_route.new_record?
-      add_breadcrumb @call_route, call_route_path(@call_route)
+      add_breadcrumb @call_route, @call_route
     end
   end
 
diff --git a/app/controllers/gateways_controller.rb b/app/controllers/gateways_controller.rb
index 6173ca3..5741195 100644
--- a/app/controllers/gateways_controller.rb
+++ b/app/controllers/gateways_controller.rb
@@ -1,18 +1,24 @@
 class GatewaysController < ApplicationController
+  authorize_resource :gateway
+
   def index
     @gateways = Gateway.all
+    spread_breadcrumbs
   end
 
   def show
     @gateway = Gateway.find(params[:id])
+    spread_breadcrumbs
   end
 
   def new
     @gateway = Gateway.new
+    spread_breadcrumbs
   end
 
   def create
     @gateway = Gateway.new(params[:gateway])
+    spread_breadcrumbs
     if @gateway.save
       redirect_to @gateway, :notice => t('gateways.controller.successfuly_created')
     else
@@ -22,10 +28,12 @@ class GatewaysController < ApplicationController
 
   def edit
     @gateway = Gateway.find(params[:id])
+    spread_breadcrumbs
   end
 
   def update
     @gateway = Gateway.find(params[:id])
+    spread_breadcrumbs
     if @gateway.update_attributes(params[:gateway])
       redirect_to @gateway, :notice  => t('gateways.controller.successfuly_updated')
     else
@@ -38,4 +46,12 @@ class GatewaysController < ApplicationController
     @gateway.destroy
     redirect_to gateways_url, :notice => t('gateways.controller.successfuly_destroyed')
   end
+
+  private
+  def spread_breadcrumbs
+    add_breadcrumb t("gateways.index.page_title"), gateways_path
+    if @gateway && !@gateway.new_record?
+      add_breadcrumb @gateway, @gateway
+    end
+  end  
 end