From 7804c740a6d14f541e23cfd5756d1ee361f5808e Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 12 May 2020 15:30:59 +0100 Subject: [PATCH] Add name to permitted params and fix some rubocop issues --- .../templates/admin/columns_dropdown.html.haml | 2 +- .../admin/column_preferences_controller.rb | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/templates/admin/columns_dropdown.html.haml b/app/assets/javascripts/templates/admin/columns_dropdown.html.haml index cae123bbcf..f06944182a 100644 --- a/app/assets/javascripts/templates/admin/columns_dropdown.html.haml +++ b/app/assets/javascripts/templates/admin/columns_dropdown.html.haml @@ -4,7 +4,7 @@ %div.menu{ 'ng-show' => "expanded" } %div.menu_item{ ng: { repeat: "column in columns", click: "toggle(column)", class: "{selected: column.visible}" } } %span.check - %span.name {{column.name }} + %span.name {{ column.name }} %hr %div.menu_item.text-center %input.fullwidth.orange{ type: "button", ng: { value: "saved() ? 'Saved': 'Saving'", show: "saved() || saving", disabled: "saved()" } } diff --git a/app/controllers/admin/column_preferences_controller.rb b/app/controllers/admin/column_preferences_controller.rb index 0d7198b5b3..ee21a14131 100644 --- a/app/controllers/admin/column_preferences_controller.rb +++ b/app/controllers/admin/column_preferences_controller.rb @@ -8,7 +8,6 @@ module Admin @cp_set.collection.each { |cp| authorize! :bulk_update, cp } if @cp_set.save - # Return saved VOs with IDs render json: @cp_set.collection, each_serializer: Api::Admin::ColumnPreferenceSerializer else if @cp_set.errors.present? @@ -22,17 +21,22 @@ module Admin private def permitted_params - params.permit(:action_name, column_preferences: [:id, :user_id, :action_name, :column_name, :visible]) + params.permit( + :action_name, + column_preferences: [:id, :user_id, :action_name, :column_name, :name, :visible] + ) end def load_collection - collection_hash = Hash[permitted_params[:column_preferences].each_with_index.map { |cp, i| [i, cp] }] + collection_hash = Hash[permitted_params[:column_preferences]. + each_with_index.map { |cp, i| [i, cp] }] collection_hash.select!{ |_i, cp| cp[:action_name] == permitted_params[:action_name] } @cp_set = ColumnPreferenceSet.new @column_preferences, collection_attributes: collection_hash end def collection - ColumnPreference.where(user_id: spree_current_user, action_name: permitted_params[:action_name]) + ColumnPreference.where(user_id: spree_current_user, + action_name: permitted_params[:action_name]) end def collection_actions