From a3fa8d674405659daf6144ea1bdfb711af40f4d1 Mon Sep 17 00:00:00 2001 From: Bella Deanhardt Date: Thu, 3 Oct 2024 10:13:56 -0400 Subject: [PATCH 1/3] sorting partners by name --- app/controllers/admin/partners_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/partners_controller.rb b/app/controllers/admin/partners_controller.rb index edcd0ad3c0..8d290bbafc 100644 --- a/app/controllers/admin/partners_controller.rb +++ b/app/controllers/admin/partners_controller.rb @@ -1,6 +1,6 @@ class Admin::PartnersController < AdminController def index - @partners = Partner.all.includes(:organization) + @partners = Partner.all.includes(:organization).order(:name) end def show From c1aeb5cdd7142d9defe961b8d1933b1ab1b59d96 Mon Sep 17 00:00:00 2001 From: Bella Deanhardt Date: Thu, 3 Oct 2024 13:25:27 -0400 Subject: [PATCH 2/3] bug fix for category dropdown menu dissappearance --- app/controllers/items_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/items_controller.rb b/app/controllers/items_controller.rb index cd066bac84..d48fbf88e7 100644 --- a/app/controllers/items_controller.rb +++ b/app/controllers/items_controller.rb @@ -50,7 +50,8 @@ def create @base_items = BaseItem.without_kit.alphabetized # Define a @item to be used in the `new` action to be rendered with # the provided parameters. This is required to render the page again - # with the error + the invalid parameters + # with the error + the invalid parameters. + @item_categories = current_organization.item_categories.order('name ASC') # Load categories here @item = current_organization.items.new(item_params) flash[:error] = result.error.record.errors.full_messages.to_sentence render action: :new From ab06f12ec8410e0bf8f3240b0fec153d62fc39bf Mon Sep 17 00:00:00 2001 From: Bella Deanhardt Date: Mon, 7 Oct 2024 12:52:26 -0400 Subject: [PATCH 3/3] updated partners to be sorted in human alphabetical order --- app/controllers/admin/partners_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/partners_controller.rb b/app/controllers/admin/partners_controller.rb index 8d290bbafc..4353ce4151 100644 --- a/app/controllers/admin/partners_controller.rb +++ b/app/controllers/admin/partners_controller.rb @@ -1,6 +1,6 @@ class Admin::PartnersController < AdminController def index - @partners = Partner.all.includes(:organization).order(:name) + @partners = Partner.all.includes(:organization).order('LOWER(name)') end def show