From 3816f9fb48af15ba2691a6ece88ce8f25b2c8240 Mon Sep 17 00:00:00 2001 From: Linus Gasser Date: Mon, 13 Oct 2025 08:12:36 +0200 Subject: [PATCH] Fixes for bulk email --- app/views/admin/emails/_bulk_compose.html.haml | 6 +++--- app/views/admin/emails/_bulk_filter.html.haml | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/views/admin/emails/_bulk_compose.html.haml b/app/views/admin/emails/_bulk_compose.html.haml index 32f90d89..1f44753f 100644 --- a/app/views/admin/emails/_bulk_compose.html.haml +++ b/app/views/admin/emails/_bulk_compose.html.haml @@ -55,10 +55,10 @@ %ul.small %li %code {name} - - User's full name + \- User's full name %li %code {conference} - - Conference name + \- Conference name %li %code {registrationlink} - - Link to conference registration + \- Link to conference registration diff --git a/app/views/admin/emails/_bulk_filter.html.haml b/app/views/admin/emails/_bulk_filter.html.haml index fd5db851..ca48df93 100644 --- a/app/views/admin/emails/_bulk_filter.html.haml +++ b/app/views/admin/emails/_bulk_filter.html.haml @@ -8,14 +8,7 @@ .form-group = label_tag :filter_type, 'Filter Type', class: 'col-sm-3 control-label' .col-sm-9 - = select_tag :filter_type, options_for_select([ - ['All users in the system', 'all_users'], - ['All registered users', 'all_registered'], - ['Users not registered for this conference', 'not_registered'], - ['Users who haven\'t answered any registration questions', 'no_questions_answered'], - ['Users who answered some but not all questions', 'some_questions_answered'], - ['Users who answered all registration questions', 'all_questions_answered'] - ], params[:filter_type]), { class: 'form-control', id: 'filter-type-select' } + = select_tag :filter_type, options_for_select([['All users in the system', 'all_users'], ['All registered users', 'all_registered'], ['Users not registered for this conference', 'not_registered'], ["Users who haven't answered any registration questions", 'no_questions_answered'], ['Users who answered some but not all questions', 'some_questions_answered'], ['Users who answered all registration questions', 'all_questions_answered']], params[:filter_type]), { class: 'form-control', id: 'filter-type-select' } .form-group = label_tag :search_term, 'Search in Name/Email', class: 'col-sm-3 control-label'