diff options
author | spag <spag@golwen.net> | 2013-01-18 11:19:28 +0100 |
---|---|---|
committer | spag <spag@golwen.net> | 2013-01-18 11:19:28 +0100 |
commit | c11734ec34349a5d8dee4722ab798a6e5aa3c0f4 (patch) | |
tree | 9ec92b252ee8eb5913783725355e9532302887b3 /app/controllers/gs_parameters_controller.rb | |
parent | 1e465e49670f6c0fccc1cd920992a14942d3cfba (diff) | |
parent | d4e7d4a5d5bdb63fbda279dbc8dd2ec495b90907 (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers/gs_parameters_controller.rb')
-rw-r--r-- | app/controllers/gs_parameters_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/gs_parameters_controller.rb b/app/controllers/gs_parameters_controller.rb index 3c212c1..7ca4e8e 100644 --- a/app/controllers/gs_parameters_controller.rb +++ b/app/controllers/gs_parameters_controller.rb @@ -10,7 +10,7 @@ class GsParametersController < ApplicationController end def show - @gs_parameter = GsParameter.find(gs_parameter_params[:id]) + @gs_parameter = GsParameter.find(params[:id]) end def new @@ -18,11 +18,11 @@ class GsParametersController < ApplicationController end def edit - @gs_parameter = GsParameter.find(gs_parameter_params[:id]) + @gs_parameter = GsParameter.find(params[:id]) end def update - @gs_parameter = GsParameter.find(gs_parameter_params[:id]) + @gs_parameter = GsParameter.find(params[:id]) if @gs_parameter.update_attributes(gs_parameter_params) redirect_to @gs_parameter, :notice => t('gs_parameters.controller.successfuly_updated') else @@ -32,7 +32,7 @@ class GsParametersController < ApplicationController private def gs_parameter_params - params.require(:gs_parameter).permit(:id, :value, :class_type, :description) + params.require(:gs_parameter).permit(:value, :class_type, :description) end def spread_breadcrumbs |