Skip to content

Self-hosted project management for devs and their clients: tickets, time tracking, docs and meetings, with an AI assistant that cites its sources. AGPL-3.0.

Keep the expert form's project and the order of same-minute meetings

Guido Boyke5dda956bede6
diff --git a/app/helpers/smart_folder_helper.rb b/app/helpers/smart_folder_helper.rb
index b311282..6300b3e 100644
--- a/app/helpers/smart_folder_helper.rb
+++ b/app/helpers/smart_folder_helper.rb
@@ -185,7 +185,10 @@ module SmartFolderHelper
# Filter by search term, if one is present
records = records.where('name ILIKE ?', "%#{search_term}%") if search_term.present? && model_class.column_names.include?('name')
- records = records.limit(50) # Limit for performance
+ # Limit for performance. Not for projects: the reader's projects are few, the
+ # filter bar offers all of them, and the expert form has no search, so a
+ # view on a project past the cut would open with a blank value.
+ records = records.limit(50) unless model_class == Project
# Format options
records.map do |record|
diff --git a/app/services/meetings/list_query.rb b/app/services/meetings/list_query.rb
index 497822f..2a047a2 100644
--- a/app/services/meetings/list_query.rb
+++ b/app/services/meetings/list_query.rb
@@ -21,7 +21,10 @@ module Meetings
column = 'occurred_at' unless SORT_COLUMNS.include?(column)
direction = sort['direction'].presence || smart_folder&.effective_sort_direction || 'desc'
direction = 'desc' unless %w[asc desc].include?(direction)
- query.reorder(column => direction, id: direction)
+ # Ties by the time a meeting was entered: occurred_at has minutes only, and
+ # the new meeting from the "+" modal belongs at the top, not wherever its
+ # random id puts it. The id makes the order total.
+ query.reorder(column => direction, created_at: direction, id: direction)
.select(*LIST_COLUMNS).preload(:meeting_participants, :creator)
end
end
diff --git a/spec/requests/organisations/meetings_overview_views_spec.rb b/spec/requests/organisations/meetings_overview_views_spec.rb
index c7ae0cf..cf7af2c 100644
--- a/spec/requests/organisations/meetings_overview_views_spec.rb
+++ b/spec/requests/organisations/meetings_overview_views_spec.rb
@@ -245,6 +245,30 @@ RSpec.describe 'Organisations::MeetingsOverview saved views', :ci_guard, type: :
expect(response.parsed_body.fetch('options').map { |option| option['label'] }).to eq(['Projekt Alpha', 'Projekt Beta'])
end
+ # The bar offers every readable project, and a view saved there names any of
+ # them. The expert form has no search, so a cut-off list would show such a
+ # view's project as blank and refuse to save it unchanged.
+ it 'offers every readable project and keeps the stored one selected beyond the first 50' do
+ 50.times do |index|
+ create(:project_permission, project: create(:project, organisation: organisation, name: format('Projekt %02d', index)),
+ user: user, meetings_access: 'read_only')
+ end
+ zeta = create(:project, organisation: organisation, name: 'Projekt Zeta')
+ create(:project_permission, project: zeta, user: user, meetings_access: 'read_only')
+ view = folder('Nur Zeta').tap do |saved|
+ saved.smart_folder_rule_groups.create!(position: 1)
+ .smart_folder_rules.create!(field: 'project', operator: 'equals', value: zeta.id, position: 1)
+ end
+
+ get organisation_reference_options_path(organisation, field: 'project'), params: { context_type: 'Meeting' }
+ expect(response.parsed_body.fetch('options').size).to eq(53)
+
+ form = page_at(edit_organisation_smart_folder_path(organisation, view, modal: true, return_to: 'meetings'))
+ value_select = form.find("select[data-field='project']")
+ expect(value_select.all('option').size).to eq(54) # the prompt and 53 projects
+ expect(value_select.find('option[selected]').text).to eq('Projekt Zeta')
+ end
+
it 'does not offer the project field on a view of one project' do
get new_organisation_smart_folder_path(organisation, context_type: 'Meeting', project_id: project_a.id, modal: true, return_to: 'meetings')
diff --git a/spec/services/meetings/list_query_spec.rb b/spec/services/meetings/list_query_spec.rb
index a32b94b..2f180ce 100644
--- a/spec/services/meetings/list_query_spec.rb
+++ b/spec/services/meetings/list_query_spec.rb
@@ -31,6 +31,19 @@ RSpec.describe Meetings::ListQuery do
result.resource.reload
end
+ # occurred_at comes from a form field of minutes, so two meetings entered back
+ # to back share it. The one entered last comes first, also against the order
+ # of their random ids: the "+" modal on "Alle Meetings" promises the new
+ # meeting at the top.
+ it 'breaks a tie of the sort column by the time a meeting was entered' do
+ at = Time.zone.parse('2026-10-01 10:00')
+ older = meeting('Older', id: 'ffffffff-ffff-4fff-bfff-ffffffffffff', occurred_at: at, created_at: 2.minutes.ago)
+ newer = meeting('Newer', id: '00000000-0000-4000-8000-000000000000', occurred_at: at, created_at: 1.minute.ago)
+
+ expect(query.map(&:id)).to eq([newer.id, older.id])
+ expect(query(sort: { 'column' => 'occurred_at', 'direction' => 'asc' }).map(&:id)).to eq([older.id, newer.id])
+ end
+
it 'searches titles separately and retains notes, transcript and summaries without requiring release' do
title = meeting('Needle')
notes = meeting('Notes', notes: 'Needle')