Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix intermittent 500 errors on dashboard templates controller #427

Merged
merged 1 commit into from
Aug 31, 2017
Merged

Fix intermittent 500 errors on dashboard templates controller #427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions api/app/controllers/mno_enterprise/jpi/v1/admin/impac/dashboard_templates_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@ def show

# POST /mnoe/jpi/v1/admin/impac/dashboard_templates
def create
@dashboard_template = dashboard_templates.create(dashboard_template_params.merge(dashboard_type: 'template'))
return render json: { errors: dashboard_template.errors }, status: :bad_request unless dashboard_template.valid?
@dashboard_template = MnoEnterprise::Impac::Dashboard.new(dashboard_template_params.merge(dashboard_type: 'template'))

# Abort on failure
unless @dashboard_template.save
return render json: { errors: dashboard_template.errors }, status: :bad_request
end

MnoEnterprise::EventLogger.info('dashboard_template_create', current_user.id, 'Dashboard Template Creation', dashboard_template)
render 'show'
Expand All @@ -40,8 +44,10 @@ def create
def update
return render json: { errors: { message: 'Dashboard template not found' } }, status: :not_found unless dashboard_template

dashboard_template.update(dashboard_template_params)
return render json: { errors: dashboard_template.errors }, status: :bad_request unless dashboard_template.valid?
# Abort on failure
unless dashboard_template.update(dashboard_template_params)
return render json: { errors: dashboard_template.errors }, status: :bad_request
end

MnoEnterprise::EventLogger.info('dashboard_template_update', current_user.id, 'Dashboard Template Update', dashboard_template)
render 'show'
Expand All @@ -51,7 +57,10 @@ def update
def destroy
return render json: { errors: { message: 'Dashboard template not found' } }, status: :not_found unless dashboard_template

return render json: { errors: 'Cannot destroy dashboard template' }, status: :bad_request unless dashboard_template.destroy
# Abort on failure
unless dashboard_template.destroy
return render json: { errors: 'Cannot destroy dashboard template' }, status: :bad_request
end

MnoEnterprise::EventLogger.info('dashboard_template_delete', current_user.id, 'Dashboard Template Deletion', dashboard_template)
head status: :ok
Expand Down