summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-20 21:09:31 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-20 21:09:31 +0100
commit04d6df5fec774725d9d67d0a485e3a29ae7c905b (patch)
treed999656b56d0d8eb590e9ec89b3c80bdaaea24fe
parent8ec95de06fcddf296d392ef6d04a46e68f2429ca (diff)
parentfb18fd9bae2d24bef4652b40a4b0d206b77ebb4f (diff)
Merge branch 'breadcrumbs' into develop
-rw-r--r--app/controllers/call_routes_controller.rb9
-rw-r--r--app/controllers/gateways_controller.rb16
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