kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix static_analysis failure

This commit is contained in:
Matija Čupić 2018-02-06 17:56:54 +01:00
parent d05cc9c6a6
commit efcdc269e0
No known key found for this signature in database
GPG Key ID: 4BAF84FFACD2E5DE
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/groups/variables_controller.rb
View File

@ -11,20 +11,28 @@ module Groups
end
def update
if @group.update(variables_params)
if @group.update(group_variables_params)
respond_to do |format|
format.json { return render status: :ok, json: { variables: GroupVariableSerializer.new.represent(@group.variables) } }
format.json { return render_group_variables }
end
else
respond_to do |format|
format.json { render status: :bad_request, json: @group.errors.full_messages }
format.json { render_error }
end
end
end
private
def variables_params
def render_group_variables
render status: :ok, json: { variables: GroupVariableSerializer.new.represent(@group.variables) }
end
def render_error
render status: :bad_request, json: @group.errors.full_messages
end
def group_variables_params
params.permit(variables_attributes: [*variable_params_attributes])
end

12
app/controllers/projects/variables_controller.rb
View File

@ -12,17 +12,25 @@ class Projects::VariablesController < Projects::ApplicationController
def update
if @project.update(variables_params)
respond_to do |format|
format.json { return render status: :ok, json: { variables: VariableSerializer.new.represent(@project.variables) } }
format.json { return render_variables }
end
else
respond_to do |format|
format.json { render status: :bad_request, json: @project.errors.full_messages }
format.json { render_error }
end
end
end
private
def render_variables
render status: :ok, json: { variables: VariableSerializer.new.represent(@project.variables) }
end
def render_error
render status: :bad_request, json: @project.errors.full_messages
end
def variables_params
params.permit(variables_attributes: [*variable_params_attributes])
end