From 90062240e55eba7f561d9f57ec369e5412c301e2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 15 Feb 2026 06:06:14 +0000 Subject: [PATCH 01/11] Initial plan From 59ef95aef1f6d04000b2ae91a180cfbb276fe536 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 15 Feb 2026 06:14:50 +0000 Subject: [PATCH 02/11] Add documentation showing issue #971 is already complete Co-authored-by: maebeale <7607813+maebeale@users.noreply.github.com> --- docs/issue_971_resolution.md | 93 ++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 docs/issue_971_resolution.md diff --git a/docs/issue_971_resolution.md b/docs/issue_971_resolution.md new file mode 100644 index 000000000..a54dfc738 --- /dev/null +++ b/docs/issue_971_resolution.md @@ -0,0 +1,93 @@ +# Issue #971 Resolution: Add WorkshopTitle to WorkshopLog + +## Summary +Issue #971 requested to add WorkshopTitle to WorkshopLog, set up similar to the story ideas form. **This feature has already been fully implemented.** + +## Investigation Results + +### Complete Implementation Found + +All required components are in place and working: + +1. **Database Schema** ✅ + - Column `external_workshop_title` exists in `reports` table (line 672 of schema.rb) + - Migration: `db/migrate/20260210140931_add_external_workshop_title_to_reports.rb` + +2. **Form UI** ✅ + - Field added to `app/views/workshop_logs/_form.html.erb` (lines 25-32) + - Uses identical label as StoryIdea: "External title (if no workshop above)" + - Text input with proper styling + +3. **Controller** ✅ + - Parameter `:external_workshop_title` permitted in `workshop_log_params` method + - File: `app/controllers/workshop_logs_controller.rb` (line 201) + +4. **Model Logic** ✅ + - Method `workshop_title` in `app/models/workshop_log.rb` (lines 24-29) + - Correctly falls back to `external_workshop_title` when workshop is not selected + ```ruby + def workshop_title + title = owner.nil? ? workshop_name : owner.title + title = external_workshop_title if title.blank? + return "" unless title + title + end + ``` + +5. **Tests** ✅ + - Comprehensive test coverage in `spec/models/workshop_log_spec.rb` (lines 41-49) + - Tests validate: + - Returns workshop title when workshop is present + - Returns external_workshop_title when workshop is not present + - Returns empty string when neither is present + +## Comparison with StoryIdea (Reference Implementation) + +The WorkshopLog implementation matches the StoryIdea pattern exactly: + +| Feature | StoryIdea | WorkshopLog | Status | +|---------|-----------|-------------|---------| +| Database Column | `story_ideas.external_workshop_title` | `reports.external_workshop_title` | ✅ Match | +| Form Label | "External title (if no workshop above)" | "External title (if no workshop above)" | ✅ Match | +| Field Type | Text input | Text input | ✅ Match | +| Controller Permits | Yes | Yes | ✅ Match | +| Model Method | `workshop_title` uses it | `workshop_title` uses it | ✅ Match | + +## Timeline + +1. **November 21, 2025**: Initial migration created for `story_ideas` and `stories` tables +2. **February 10, 2026**: Migration created for `reports` table (WorkshopLog storage) +3. **February 13, 2026**: Issue #971 created (3 days after implementation) + +## Recommendation + +**No code changes are needed.** The feature requested in issue #971 has been fully implemented and is ready to use. + +The issue can be closed as complete. Users can now: +- Select a workshop from the dropdown OR +- Enter an external workshop title in the text field +- The `workshop_title` method will use the appropriate value + +## Usage + +When creating or editing a Workshop Log: +1. User sees a "Workshop" dropdown to select from existing workshops +2. Below it is a text field labeled "External title (if no workshop above)" +3. User can enter a custom workshop title if their workshop isn't in the system +4. The system will use the workshop's title if selected, or fall back to the external title +5. This matches the exact same pattern used in Story Ideas + +## Files Modified + +No files were modified for this investigation. The following files already contain the complete implementation: + +- `db/migrate/20260210140931_add_external_workshop_title_to_reports.rb` +- `db/schema.rb` (line 672) +- `app/models/workshop_log.rb` (lines 24-29) +- `app/views/workshop_logs/_form.html.erb` (lines 25-32) +- `app/controllers/workshop_logs_controller.rb` (line 201) +- `spec/models/workshop_log_spec.rb` (lines 41-49) + +## Conclusion + +✅ **Issue #971 is resolved and complete.** All requested functionality is implemented and tested. From feb15437befab6e2bb5a4d5e0e51eaf979a34d44 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 15 Feb 2026 13:41:22 +0000 Subject: [PATCH 03/11] Move external_workshop_title underneath workshop dropdown to match story_ideas form Co-authored-by: maebeale <7607813+maebeale@users.noreply.github.com> --- app/views/workshop_logs/_form.html.erb | 86 ++++++++++++++------------ 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/app/views/workshop_logs/_form.html.erb b/app/views/workshop_logs/_form.html.erb index 21b308925..c54507670 100644 --- a/app/views/workshop_logs/_form.html.erb +++ b/app/views/workshop_logs/_form.html.erb @@ -9,52 +9,58 @@ <% end %> -
- <%= f.input :workshop_id, - as: :select, - collection: @workshops, - label_method: :type_name, - value_method: :id, - label: "Workshop", - prompt: "Select a Workshop", - required: true, - selected: params[:workshop_id].presence || f.object.workshop_id, - input_html: { value: params[:workshop_id].presence || f.object.workshop_id, - class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" }, - label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> - <%= f.input :external_workshop_title, - as: :text, - label: "External title (if no workshop above)", - input_html: { - rows: 1, - class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" - }, - label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> - <% if current_user.person&.organization_people&.count != 1 %> - <%= f.input :organization_id, +
+
+ <%= f.input :workshop_id, as: :select, - collection: @organizations, + collection: @workshops, label_method: :type_name, value_method: :id, - label: "Organization", + label: "Workshop", + prompt: "Select a Workshop", required: true, - hint: "Please contact AWBW if your agency is not listed.", - prompt: (@organizations.count > 1 ? "Please select the relevant organization" : nil), - selected: (params[:organization_id].presence || (f.object.organization_id || (@organizations.count == 1 ? @organizations.first.id : nil))), - input_html: { value: params[:organization_id].presence || f.object.organization_id || @organization_id, + selected: params[:workshop_id].presence || f.object.workshop_id, + input_html: { value: params[:workshop_id].presence || f.object.workshop_id, class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" }, label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> - <% else current_user.person&.organization_people&.count == 1 %> - <%= f.hidden_field :organization_id, - value: f.object.organization_id || current_user.person.primary_organization&.id %> - <% end %> - <%= f.input :date, - label: "Workshop Date", - as: :string, - required: true, - input_html: { type: 'date', value: f.object.date&.strftime('%Y-%m-%d'), - class: "block w-fullrounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" }, - label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> + <%= f.input :external_workshop_title, + as: :text, + label: "External title (if no workshop above)", + input_html: { + rows: 1, + class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" + }, + label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> +
+
+ <% if current_user.person&.organization_people&.count != 1 %> + <%= f.input :organization_id, + as: :select, + collection: @organizations, + label_method: :type_name, + value_method: :id, + label: "Organization", + required: true, + hint: "Please contact AWBW if your agency is not listed.", + prompt: (@organizations.count > 1 ? "Please select the relevant organization" : nil), + selected: (params[:organization_id].presence || (f.object.organization_id || (@organizations.count == 1 ? @organizations.first.id : nil))), + input_html: { value: params[:organization_id].presence || f.object.organization_id || @organization_id, + class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" }, + label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> + <% else current_user.person&.organization_people&.count == 1 %> + <%= f.hidden_field :organization_id, + value: f.object.organization_id || current_user.person.primary_organization&.id %> + <% end %> +
+
+ <%= f.input :date, + label: "Workshop Date", + as: :string, + required: true, + input_html: { type: 'date', value: f.object.date&.strftime('%Y-%m-%d'), + class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" }, + label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> +
From dcce3852af00f700a89556cff58257c1b4f1e385 Mon Sep 17 00:00:00 2001 From: maebeale Date: Mon, 16 Feb 2026 14:38:45 -0500 Subject: [PATCH 04/11] simplify user name method --- app/models/user.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 3149220ef..d38085e30 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -148,8 +148,7 @@ def organization_workshop_logs(date, windows_type, organization_id) end def name - return email if !first_name || first_name.empty? - "#{first_name} #{last_name}" + person ? person.full_name : email end def agency_name From 7329a716487923657afa8f69764a5d76256e3c1b Mon Sep 17 00:00:00 2001 From: maebeale Date: Mon, 16 Feb 2026 14:39:27 -0500 Subject: [PATCH 05/11] Move collection logic out of view into controller --- app/controllers/workshop_ideas_controller.rb | 3 ++- app/views/workshop_ideas/_form.html.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/workshop_ideas_controller.rb b/app/controllers/workshop_ideas_controller.rb index 9dd9cf95f..649dad1b6 100644 --- a/app/controllers/workshop_ideas_controller.rb +++ b/app/controllers/workshop_ideas_controller.rb @@ -69,9 +69,10 @@ def destroy # Optional hooks for setting variables for forms or index def set_form_variables @age_ranges = Category.includes(:category_type).where("category_types.name = 'AgeRange'").pluck(:name) - @potential_series_workshops = Workshop.published.order(:title) + @potential_series_workshops = Workshop.published.includes(:windows_type).order(:title) @sectors = Sector.published @windows_types = WindowsType.all + @authors = User.has_access.includes(:person).sort_by { |u| u.name.downcase } @categories_grouped = Category .includes(:category_type) diff --git a/app/views/workshop_ideas/_form.html.erb b/app/views/workshop_ideas/_form.html.erb index 204c23157..fff3c3908 100644 --- a/app/views/workshop_ideas/_form.html.erb +++ b/app/views/workshop_ideas/_form.html.erb @@ -69,7 +69,7 @@ <%= f.input :created_by_id, as: :select, label: "Author", - collection: User.order(:last_name, :first_name), + collection: @authors, selected: f.object.created_by_id || current_user.id, input_html: { class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm" } %> From dca9235d0a2efa521b3043d75106b9f0e0ce5b3f Mon Sep 17 00:00:00 2001 From: maebeale Date: Mon, 16 Feb 2026 14:39:55 -0500 Subject: [PATCH 06/11] Update claude --- .claude/settings.local.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 9f86e65f5..5a68216ec 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -6,10 +6,8 @@ "Bash(bundle exec rails runner:*)", "Bash(bundle exec rspec:*)", "Bash(bundle exec rubocop:*)", - "Bash(RAILS_ENV=test bundle exec rails runner:*)", "Bash(RAILS_ENV=test bundle exec rspec:*)", - "Bash(git add:*)", "Bash(git apply:*)", "Bash(git checkout:*)", @@ -19,20 +17,18 @@ "Bash(git push:*)", "Bash(git reset:*)", "Bash(git stash:*)", - "Bash(bin/rails db:migrate:*)", "Bash(bin/rails runner:*)", - "Bash(chmod:*)", "Bash(mysql -u root:*)", - "Bash(git -C /Users/maebeale/programming/awbw branch --show-current)", - "Bash(bundle exec rails routes:*)", "Bash(bundle exec rubocop:*)", "Bash(git -C /Users/maebeale/programming/awbw diff --name-only main...HEAD)", - "Bash(git log:*)" - + "Bash(git log:*)", + "Bash(git fetch:*)", + "Bash(git rebase:*)", + "Bash(grep:*)" ] } } From cf899506d7ce851ca008bf20739b07217b02f173 Mon Sep 17 00:00:00 2001 From: maebeale Date: Mon, 16 Feb 2026 14:40:14 -0500 Subject: [PATCH 07/11] Include windows_type to remove n+1 --- app/controllers/story_ideas_controller.rb | 2 +- app/controllers/workshop_logs_controller.rb | 1 + app/controllers/workshop_variation_ideas_controller.rb | 2 +- app/controllers/workshops_controller.rb | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/story_ideas_controller.rb b/app/controllers/story_ideas_controller.rb index 3dcd18424..5e6bb183f 100644 --- a/app/controllers/story_ideas_controller.rb +++ b/app/controllers/story_ideas_controller.rb @@ -85,7 +85,7 @@ def set_form_variables @user = User.find(params[:user_id]) if params[:user_id].present? @organizations = (@user || current_user)&.organizations&.order(:name) || Organization.none @windows_types = WindowsType.all - @workshops = Workshop.order(:title) + @workshops = Workshop.includes(:windows_type).order(:title) @users = User.active.includes(:person) @users = @users.or(User.where(id: @story_idea.created_by_id)) if @story_idea&.created_by_id diff --git a/app/controllers/workshop_logs_controller.rb b/app/controllers/workshop_logs_controller.rb index 4a4952bc6..032f5d144 100644 --- a/app/controllers/workshop_logs_controller.rb +++ b/app/controllers/workshop_logs_controller.rb @@ -120,6 +120,7 @@ def set_index_variables # needs to not be private .order("people.first_name, people.last_name") @organizations = authorized_scope(Organization.all) @workshops = Workshop.where(id: @workshop_logs_unpaginated.select(:workshop_id).distinct) + .includes(:windows_type) .order(:title) end diff --git a/app/controllers/workshop_variation_ideas_controller.rb b/app/controllers/workshop_variation_ideas_controller.rb index 0938a3231..f2d3e9415 100644 --- a/app/controllers/workshop_variation_ideas_controller.rb +++ b/app/controllers/workshop_variation_ideas_controller.rb @@ -85,7 +85,7 @@ def set_form_variables @workshop_variation_idea.build_primary_asset if @workshop_variation_idea.primary_asset.blank? @workshop_variation_idea.gallery_assets.build - @workshops = Workshop.published.order(:title) + @workshops = Workshop.published.includes(:windows_type).order(:title) @organizations = authorized_scope(Organization.all).order(:name) @windows_types = WindowsType.order(:name) @users = User.active.or(User.where(id: @workshop_variation_idea.created_by_id)) diff --git a/app/controllers/workshops_controller.rb b/app/controllers/workshops_controller.rb index 85d242935..681c0c6fa 100644 --- a/app/controllers/workshops_controller.rb +++ b/app/controllers/workshops_controller.rb @@ -186,7 +186,7 @@ def set_show def set_form_variables @age_ranges = Category.includes(:category_type).where("category_types.name = 'AgeRange'").pluck(:name) - @potential_series_workshops = Workshop.published.where.not(id: @workshop.id).order(:title) + @potential_series_workshops = Workshop.published.includes(:windows_type).where.not(id: @workshop.id).order(:title) @windows_types = WindowsType.all @workshop_ideas = WorkshopIdea.order(created_at: :desc) .map { |wi| From 00a44dc07607ca709d60b7571ee508cc62a078b3 Mon Sep 17 00:00:00 2001 From: maebeale Date: Mon, 16 Feb 2026 14:43:14 -0500 Subject: [PATCH 08/11] Fix user scope back to older version --- app/controllers/workshop_ideas_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/workshop_ideas_controller.rb b/app/controllers/workshop_ideas_controller.rb index 649dad1b6..0dfc6dda1 100644 --- a/app/controllers/workshop_ideas_controller.rb +++ b/app/controllers/workshop_ideas_controller.rb @@ -72,7 +72,7 @@ def set_form_variables @potential_series_workshops = Workshop.published.includes(:windows_type).order(:title) @sectors = Sector.published @windows_types = WindowsType.all - @authors = User.has_access.includes(:person).sort_by { |u| u.name.downcase } + @authors = User.active.includes(:person).sort_by { |u| u.name.downcase } @categories_grouped = Category .includes(:category_type) From f04fabd3cd19ffa714c904ec2eb0ed50646b8fb6 Mon Sep 17 00:00:00 2001 From: maebeale Date: Mon, 16 Feb 2026 15:50:34 -0500 Subject: [PATCH 09/11] Update specs to match view changes --- spec/mailers/notification_mailer_spec.rb | 2 +- spec/models/user_spec.rb | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb index d4d597a57..3a4d10142 100644 --- a/spec/mailers/notification_mailer_spec.rb +++ b/spec/mailers/notification_mailer_spec.rb @@ -63,7 +63,7 @@ it "renders the headers" do expect(mail.subject).to include("AWBW portal:") expect(mail.subject).to include("password reset") - expect(mail.subject).to include(notification.noticeable.name) + expect(mail.subject).to include(notification.noticeable.full_name) expect(mail.to).to eq([ ENV.fetch("REPLY_TO_EMAIL", "programs@awbw.org") ]) expect(mail.from).to eq([ ENV.fetch("REPLY_TO_EMAIL", "programs@awbw.org") ]) expect(mail.reply_to).to eq([ ENV.fetch("REPLY_TO_EMAIL", "programs@awbw.org") ]) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 5ad6be559..b7c3cf2a1 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -229,18 +229,14 @@ end describe "#name" do - it "returns first and last name when present" do - user = build(:user, first_name: "Bob", last_name: "Smith") + it "returns person full_name when person is present" do + person = build(:person, first_name: "Bob", last_name: "Smith") + user = build(:user, person: person) expect(user.name).to eq("Bob Smith") end - it "returns email when first_name is nil" do - user = build(:user, first_name: nil) - expect(user.name).to eq(user.email) - end - - it "returns email when first_name is empty" do - user = build(:user, first_name: "") + it "returns email when no person" do + user = build(:user, person: nil) expect(user.name).to eq(user.email) end end From b26fd920f797b264840576063ac67c3030cd365d Mon Sep 17 00:00:00 2001 From: maebeale Date: Mon, 16 Feb 2026 15:51:37 -0500 Subject: [PATCH 10/11] Remove doc --- docs/issue_971_resolution.md | 93 ------------------------------------ 1 file changed, 93 deletions(-) delete mode 100644 docs/issue_971_resolution.md diff --git a/docs/issue_971_resolution.md b/docs/issue_971_resolution.md deleted file mode 100644 index a54dfc738..000000000 --- a/docs/issue_971_resolution.md +++ /dev/null @@ -1,93 +0,0 @@ -# Issue #971 Resolution: Add WorkshopTitle to WorkshopLog - -## Summary -Issue #971 requested to add WorkshopTitle to WorkshopLog, set up similar to the story ideas form. **This feature has already been fully implemented.** - -## Investigation Results - -### Complete Implementation Found - -All required components are in place and working: - -1. **Database Schema** ✅ - - Column `external_workshop_title` exists in `reports` table (line 672 of schema.rb) - - Migration: `db/migrate/20260210140931_add_external_workshop_title_to_reports.rb` - -2. **Form UI** ✅ - - Field added to `app/views/workshop_logs/_form.html.erb` (lines 25-32) - - Uses identical label as StoryIdea: "External title (if no workshop above)" - - Text input with proper styling - -3. **Controller** ✅ - - Parameter `:external_workshop_title` permitted in `workshop_log_params` method - - File: `app/controllers/workshop_logs_controller.rb` (line 201) - -4. **Model Logic** ✅ - - Method `workshop_title` in `app/models/workshop_log.rb` (lines 24-29) - - Correctly falls back to `external_workshop_title` when workshop is not selected - ```ruby - def workshop_title - title = owner.nil? ? workshop_name : owner.title - title = external_workshop_title if title.blank? - return "" unless title - title - end - ``` - -5. **Tests** ✅ - - Comprehensive test coverage in `spec/models/workshop_log_spec.rb` (lines 41-49) - - Tests validate: - - Returns workshop title when workshop is present - - Returns external_workshop_title when workshop is not present - - Returns empty string when neither is present - -## Comparison with StoryIdea (Reference Implementation) - -The WorkshopLog implementation matches the StoryIdea pattern exactly: - -| Feature | StoryIdea | WorkshopLog | Status | -|---------|-----------|-------------|---------| -| Database Column | `story_ideas.external_workshop_title` | `reports.external_workshop_title` | ✅ Match | -| Form Label | "External title (if no workshop above)" | "External title (if no workshop above)" | ✅ Match | -| Field Type | Text input | Text input | ✅ Match | -| Controller Permits | Yes | Yes | ✅ Match | -| Model Method | `workshop_title` uses it | `workshop_title` uses it | ✅ Match | - -## Timeline - -1. **November 21, 2025**: Initial migration created for `story_ideas` and `stories` tables -2. **February 10, 2026**: Migration created for `reports` table (WorkshopLog storage) -3. **February 13, 2026**: Issue #971 created (3 days after implementation) - -## Recommendation - -**No code changes are needed.** The feature requested in issue #971 has been fully implemented and is ready to use. - -The issue can be closed as complete. Users can now: -- Select a workshop from the dropdown OR -- Enter an external workshop title in the text field -- The `workshop_title` method will use the appropriate value - -## Usage - -When creating or editing a Workshop Log: -1. User sees a "Workshop" dropdown to select from existing workshops -2. Below it is a text field labeled "External title (if no workshop above)" -3. User can enter a custom workshop title if their workshop isn't in the system -4. The system will use the workshop's title if selected, or fall back to the external title -5. This matches the exact same pattern used in Story Ideas - -## Files Modified - -No files were modified for this investigation. The following files already contain the complete implementation: - -- `db/migrate/20260210140931_add_external_workshop_title_to_reports.rb` -- `db/schema.rb` (line 672) -- `app/models/workshop_log.rb` (lines 24-29) -- `app/views/workshop_logs/_form.html.erb` (lines 25-32) -- `app/controllers/workshop_logs_controller.rb` (line 201) -- `spec/models/workshop_log_spec.rb` (lines 41-49) - -## Conclusion - -✅ **Issue #971 is resolved and complete.** All requested functionality is implemented and tested. From 7e8d6fef57a0ae74c4bf46bade1565a9923df492 Mon Sep 17 00:00:00 2001 From: maebeale Date: Mon, 16 Feb 2026 16:24:57 -0500 Subject: [PATCH 11/11] Use renamed scope --- app/controllers/workshop_ideas_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/workshop_ideas_controller.rb b/app/controllers/workshop_ideas_controller.rb index 0dfc6dda1..649dad1b6 100644 --- a/app/controllers/workshop_ideas_controller.rb +++ b/app/controllers/workshop_ideas_controller.rb @@ -72,7 +72,7 @@ def set_form_variables @potential_series_workshops = Workshop.published.includes(:windows_type).order(:title) @sectors = Sector.published @windows_types = WindowsType.all - @authors = User.active.includes(:person).sort_by { |u| u.name.downcase } + @authors = User.has_access.includes(:person).sort_by { |u| u.name.downcase } @categories_grouped = Category .includes(:category_type)