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

Superadmin Partners View (4682) & Category Dropdown Error (4674) #4703

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Superadmin Partners View (4682) & Category Dropdown Error (4674) #4703

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a3fa8d6
sorting partners by name
bdeanhardt Oct 3, 2024
c1aeb5c
bug fix for category dropdown menu dissappearance
bdeanhardt Oct 3, 2024
ab06f12
updated partners to be sorted in human alphabetical order
bdeanhardt Oct 7, 2024
12bed2e
updated to include tests
bdeanhardt Oct 16, 2024
8583e34
test for alphabetical order
bdeanhardt Oct 22, 2024
4fd0140
fixed alphabetical order testing and removed incorrect controller test
bdeanhardt Oct 24, 2024
186fc3b
small fix
bdeanhardt Oct 24, 2024
a67431a
small fix
bdeanhardt Oct 24, 2024
a65d019
updated test for categories bug fix
bdeanhardt Oct 24, 2024
20f4ba5
linter fix
bdeanhardt Oct 29, 2024
94d4728
updated tests to manually create categories
bdeanhardt Nov 19, 2024
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
2 changes: 1 addition & 1 deletion app/controllers/admin/partners_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class Admin::PartnersController < AdminController
def index
@partners = Partner.all.includes(:organization)
@partners = Partner.all.includes(:organization).order('LOWER(name)')
end

def show
Expand Down
3 changes: 2 additions & 1 deletion app/controllers/items_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading