Fix a few more rubocop issues

.rubocop_manual_todo.yml

@@ -33,7 +33,6 @@ Layout/LineLength:
   - app/controllers/admin/product_import_controller.rb
   - app/controllers/admin/schedules_controller.rb
   - app/controllers/admin/subscriptions_controller.rb
-  - app/controllers/admin/variant_overrides_controller.rb
   - app/controllers/api/enterprise_attachment_controller.rb
   - app/controllers/api/product_images_controller.rb
   - app/controllers/spree/paypal_controller_decorator.rb

app/controllers/admin/column_preferences_controller.rb

@@ -29,7 +29,8 @@ module Admin
       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 = Sets::ColumnPreferenceSet.new @column_preferences, collection_attributes: collection_hash
+      @cp_set = Sets::ColumnPreferenceSet.new(@column_preferences,
+                                              collection_attributes: collection_hash)
     end
 
     def collection

app/controllers/admin/variant_overrides_controller.rb

@@ -60,14 +60,17 @@ module Admin
         for_hubs(editable_enterprises.collect(&:id))
 
       options = [{ id: '0', name: 'All' }]
-      import_dates.collect(&:import_date).map { |i| options.push(id: i.to_date, name: i.to_date.to_formatted_s(:long)) }
+      import_dates.collect(&:import_date).map { |i|
+        options.push(id: i.to_date, name: i.to_date.to_formatted_s(:long))
+      }
 
       options
     end
 
     def load_collection
       collection_hash = Hash[variant_overrides_params.each_with_index.map { |vo, i| [i, vo] }]
-      @vo_set = Sets::VariantOverrideSet.new @variant_overrides, collection_attributes: collection_hash
+      @vo_set = Sets::VariantOverrideSet.new(@variant_overrides,
+                                             collection_attributes: collection_hash)
     end
 
     def collection
@@ -82,8 +85,8 @@ module Admin
       [:index, :bulk_update, :bulk_reset]
     end
 
-    # This has been pulled from ModelSet as it is useful for compiling a list of errors on any generic collection (not necessarily a ModelSet)
-    # Could be pulled down into a lower level controller if it is useful in other high level controllers
+    # This method is also present in ModelSet
+    # This is useful for compiling a list of errors on any generic collection
     def collection_errors
       errors = ActiveModel::Errors.new self
       full_messages = @collection.map { |element| element.errors.full_messages }.flatten