From df6c561e164bb90e1c6257df2f49e32d8c127c1a Mon Sep 17 00:00:00 2001 From: hanie Date: Fri, 28 Aug 2026 11:16:35 -0400 Subject: [PATCH 1/8] change edit my orgnaization to change my profile --- Gemfile.lock | 2 +- app/views/partners/profiles/step/edit.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9f574469f4..bac8c14367 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -869,4 +869,4 @@ DEPENDENCIES webmock (~> 3.26) BUNDLED WITH - 2.7.1 + 4.0.19 diff --git a/app/views/partners/profiles/step/edit.html.erb b/app/views/partners/profiles/step/edit.html.erb index 513a53b3fe..3b6a56876f 100644 --- a/app/views/partners/profiles/step/edit.html.erb +++ b/app/views/partners/profiles/step/edit.html.erb @@ -3,7 +3,7 @@
<% content_for :title, "Step Editing - #{current_partner.name}" %> -

  Edit My Organization    +

  Edit My Profile    <%= partner_status_badge(current_partner) %> for <%= current_partner.name %>

From 2021059a876806dd080c51fb7cc96c68eb30c43a Mon Sep 17 00:00:00 2001 From: hanie Date: Sat, 29 Aug 2026 09:25:55 -0400 Subject: [PATCH 2/8] natural alphebetize product drives --- app/controllers/product_drives_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/product_drives_controller.rb b/app/controllers/product_drives_controller.rb index 874957378f..d2ea3a9a58 100644 --- a/app/controllers/product_drives_controller.rb +++ b/app/controllers/product_drives_controller.rb @@ -15,7 +15,7 @@ def index @paginated_product_drives = @product_drives.page(params[:page]) # to be used in the name filter to sort product drives in alpha order - @product_drives_alphabetical = @product_drives.sort_by { |pd| pd.name.downcase } + @product_drives_alphabetical = @product_drives.natural_sort_by { |pd| pd.name.downcase } @item_categories = current_organization.item_categories @selected_name_filter = filter_params[:by_name] @selected_item_category = filter_params[:by_item_category_id] From 2fbff2cc6adacd4cdeede81db4acb9508cae543f Mon Sep 17 00:00:00 2001 From: hanie Date: Sat, 29 Aug 2026 11:04:41 -0400 Subject: [PATCH 3/8] natural alphabetize product drive --- app/controllers/product_drives_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/product_drives_controller.rb b/app/controllers/product_drives_controller.rb index d2ea3a9a58..5ea04a6d67 100644 --- a/app/controllers/product_drives_controller.rb +++ b/app/controllers/product_drives_controller.rb @@ -15,7 +15,7 @@ def index @paginated_product_drives = @product_drives.page(params[:page]) # to be used in the name filter to sort product drives in alpha order - @product_drives_alphabetical = @product_drives.natural_sort_by { |pd| pd.name.downcase } + @product_drives_alphabetical = @product_drives.natural_sort @item_categories = current_organization.item_categories @selected_name_filter = filter_params[:by_name] @selected_item_category = filter_params[:by_item_category_id] From b0a98c109719f54e621e88a0c40e20ed687654fb Mon Sep 17 00:00:00 2001 From: hanie Date: Sat, 29 Aug 2026 11:20:40 -0400 Subject: [PATCH 4/8] natural alphabetize product drive --- app/controllers/product_drives_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/product_drives_controller.rb b/app/controllers/product_drives_controller.rb index 5ea04a6d67..8a0fefb865 100644 --- a/app/controllers/product_drives_controller.rb +++ b/app/controllers/product_drives_controller.rb @@ -15,7 +15,7 @@ def index @paginated_product_drives = @product_drives.page(params[:page]) # to be used in the name filter to sort product drives in alpha order - @product_drives_alphabetical = @product_drives.natural_sort + @product_drives_alphabetical = @product_drives.to_a.natural_sort_by { |pd| pd.name.downcase } @item_categories = current_organization.item_categories @selected_name_filter = filter_params[:by_name] @selected_item_category = filter_params[:by_item_category_id] From f2c96ab3b074ce1eebaad04bcfb2ec44b8263dfb Mon Sep 17 00:00:00 2001 From: hanie Date: Sat, 29 Aug 2026 11:26:38 -0400 Subject: [PATCH 5/8] natural alphabetize product drive --- app/controllers/product_drives_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/product_drives_controller.rb b/app/controllers/product_drives_controller.rb index 8a0fefb865..f3255dd925 100644 --- a/app/controllers/product_drives_controller.rb +++ b/app/controllers/product_drives_controller.rb @@ -15,7 +15,9 @@ def index @paginated_product_drives = @product_drives.page(params[:page]) # to be used in the name filter to sort product drives in alpha order - @product_drives_alphabetical = @product_drives.to_a.natural_sort_by { |pd| pd.name.downcase } + @product_drives_alphabetical = @product_drives.to_a.sort_by do |pd| + pd.name.downcase.split(/(\d+)/).map { |chunk| chunk.match?(/^\d+$/) ? chunk.to_i : chunk } +end @item_categories = current_organization.item_categories @selected_name_filter = filter_params[:by_name] @selected_item_category = filter_params[:by_item_category_id] From ceb77fbff0a5cd7a69cb302c5360918aad441c92 Mon Sep 17 00:00:00 2001 From: hanie Date: Sat, 29 Aug 2026 11:31:47 -0400 Subject: [PATCH 6/8] natural alphabetize product drive --- app/controllers/product_drives_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/product_drives_controller.rb b/app/controllers/product_drives_controller.rb index f3255dd925..311fbbc96c 100644 --- a/app/controllers/product_drives_controller.rb +++ b/app/controllers/product_drives_controller.rb @@ -15,9 +15,8 @@ def index @paginated_product_drives = @product_drives.page(params[:page]) # to be used in the name filter to sort product drives in alpha order - @product_drives_alphabetical = @product_drives.to_a.sort_by do |pd| - pd.name.downcase.split(/(\d+)/).map { |chunk| chunk.match?(/^\d+$/) ? chunk.to_i : chunk } -end + @product_drives_alphabetical = @product_drives.to_a.sort_by do |pd|pd.name.downcase.split(/(\d+)/).map { |chunk| chunk.match?(/^\d+$/) ? chunk.to_i : chunk } + end @item_categories = current_organization.item_categories @selected_name_filter = filter_params[:by_name] @selected_item_category = filter_params[:by_item_category_id] From 8df416721d147e8bfbb7177e98733ee7f155f1c9 Mon Sep 17 00:00:00 2001 From: hanie Date: Sat, 29 Aug 2026 11:33:31 -0400 Subject: [PATCH 7/8] natural alphabetize product drive --- app/controllers/product_drives_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/product_drives_controller.rb b/app/controllers/product_drives_controller.rb index 311fbbc96c..a334351f02 100644 --- a/app/controllers/product_drives_controller.rb +++ b/app/controllers/product_drives_controller.rb @@ -15,7 +15,8 @@ def index @paginated_product_drives = @product_drives.page(params[:page]) # to be used in the name filter to sort product drives in alpha order - @product_drives_alphabetical = @product_drives.to_a.sort_by do |pd|pd.name.downcase.split(/(\d+)/).map { |chunk| chunk.match?(/^\d+$/) ? chunk.to_i : chunk } + @product_drives_alphabetical = @product_drives.to_a.sort_by do |pd| + pd.name.downcase.split(/(\d+)/).map { |chunk| chunk.match?(/^\d+$/) ? chunk.to_i : chunk } end @item_categories = current_organization.item_categories @selected_name_filter = filter_params[:by_name] From fd5f7eec43cdb1f582fb1ebcb566a5031f0a3b0b Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Aug 2026 16:18:35 -0400 Subject: [PATCH 8/8] Keep the previous nbsp removal We removed this in a parallel commit --- app/views/partners/profiles/step/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/partners/profiles/step/edit.html.erb b/app/views/partners/profiles/step/edit.html.erb index 3b6a56876f..0cef3f9010 100644 --- a/app/views/partners/profiles/step/edit.html.erb +++ b/app/views/partners/profiles/step/edit.html.erb @@ -3,7 +3,7 @@
<% content_for :title, "Step Editing - #{current_partner.name}" %> -

  Edit My Profile    +

  Edit My Profile <%= partner_status_badge(current_partner) %> for <%= current_partner.name %>