diff --git a/app/forms/admin/settings/aggregation_settings_form.rb b/app/forms/admin/settings/aggregation_settings_form.rb
new file mode 100644
index 000000000000..b3466f9b7cc3
--- /dev/null
+++ b/app/forms/admin/settings/aggregation_settings_form.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Admin
+ module Settings
+ class AggregationSettingsForm < ApplicationForm
+ include Redmine::I18n
+
+ settings_form do |f|
+ f.text_field name: :journal_aggregation_time_minutes,
+ type: :number,
+ min: 0,
+ input_width: :medium,
+ trailing_visual: { text: { text: I18n.t("datetime.units.minute_abbreviated", count: 2) } }
+
+ f.submit
+ end
+ end
+ end
+end
diff --git a/app/forms/admin/settings/aggregation_settings_form/journal_aggregation_time_minutes_caption.html.erb b/app/forms/admin/settings/aggregation_settings_form/journal_aggregation_time_minutes_caption.html.erb
new file mode 100644
index 000000000000..986e2aa67fda
--- /dev/null
+++ b/app/forms/admin/settings/aggregation_settings_form/journal_aggregation_time_minutes_caption.html.erb
@@ -0,0 +1,8 @@
+<%= render(Primer::Beta::Text.new(tag: :p)) do %>
+ <%= link_translate("admin.journal_aggregation.caption", links: { webhook_link: url_helpers.admin_outgoing_webhooks_path }) %>
+<% end %>
+<%= render(Primer::OpenProject::InlineMessage.new(scheme: :warning, size: :small)) do %>
+ <%= render(Primer::Beta::Text.new(tag: :p)) do %>
+ <%= I18n.t(:text_hint_disable_with_0) %>
+ <% end %>
+<% end %>
diff --git a/app/forms/admin/settings/mail_notifications_setting_form.rb b/app/forms/admin/settings/mail_notifications_setting_form.rb
new file mode 100644
index 000000000000..a944711699d4
--- /dev/null
+++ b/app/forms/admin/settings/mail_notifications_setting_form.rb
@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Admin
+ module Settings
+ class MailNotificationsSettingForm < ApplicationForm
+ include ::Settings::FormHelper
+
+ settings_form do |f|
+ if @deliveries
+ f.text_field name: :mail_from, input_width: :medium
+ f.check_box name: :bcc_recipients
+ f.check_box name: :plain_text_mail
+ f.select_list name: :emails_salutation,
+ values: [
+ [User.human_attribute_name(:firstname), :firstname],
+ [I18n.t("mail.salutation_full_name"), :name]
+ ],
+ input_width: :medium
+
+ f.fieldset_group(title: "#{I18n.t(:setting_emails_header)} & #{I18n.t(:setting_emails_footer)}", mt: 4) do |fg|
+ fg.multi_language_text_select(name: :emails_header)
+ fg.multi_language_text_select(name: :emails_footer)
+ end
+ end
+
+ unless OpenProject::Configuration["email_delivery_configuration"] == "legacy"
+ email_methods = %i[smtp sendmail]
+ email_methods += [:letter_opener] if Rails.env.development?
+
+ f.fieldset_group(title: I18n.t(:text_setup_mail_configuration), mt: 4) do |fg|
+ fg.select_list(
+ name: :email_delivery_method,
+ values: email_methods.map { |m| [m.to_s, m] },
+ input_width: :small,
+ data: {
+ show_when_value_selected_target: "cause",
+ target_name: "email_delivery_method_settings"
+ }
+ )
+ end
+
+ f.group(
+ hidden: { true => Setting.email_delivery_method != :smtp },
+ data: {
+ show_when_value_selected_target: "effect",
+ target_name: "email_delivery_method_settings",
+ value: "smtp"
+ }
+ ) do |smtp|
+ smtp.text_field(name: :smtp_address, input_width: :medium)
+ smtp.text_field(name: :smtp_port, type: :number, input_width: :xsmall)
+ smtp.text_field(name: :smtp_domain, input_width: :medium)
+ smtp.select_list(name: :smtp_authentication,
+ values: %i[none plain login cram_md5].map { |m| [m.to_s, m] },
+ input_width: :small)
+ smtp.text_field(name: :smtp_user_name, input_width: :medium)
+ smtp.text_field(name: :smtp_password, input_width: :medium)
+ smtp.check_box(name: :smtp_enable_starttls_auto)
+ smtp.check_box(name: :smtp_ssl)
+ end
+
+ f.group(
+ hidden: { true => Setting.email_delivery_method != :sendmail },
+ data: {
+ show_when_value_selected_target: "effect",
+ target_name: "email_delivery_method_settings",
+ value: "sendmail"
+ }
+ ) do |sendmail|
+ sendmail.text_field(name: :sendmail_location)
+ sendmail.text_field(name: :sendmail_arguments)
+ end
+ end
+
+ f.submit
+ end
+
+ def initialize(deliveries:)
+ super()
+
+ @deliveries = deliveries
+ end
+ end
+ end
+end
diff --git a/app/views/admin/settings/aggregation_settings/show.html.erb b/app/views/admin/settings/aggregation_settings/show.html.erb
index 14308e9ff81d..18ebddc5d730 100644
--- a/app/views/admin/settings/aggregation_settings/show.html.erb
+++ b/app/views/admin/settings/aggregation_settings/show.html.erb
@@ -40,25 +40,13 @@ See COPYRIGHT and LICENSE files for more details.
end
%>
-<%= styled_form_tag(admin_settings_aggregation_path, method: :patch) do %>
-
- <% end %>
+<% if @deliveries %>
+ <%= render Primer::Beta::Link.new(
+ href: test_email_admin_index_path,
+ data: { turbo_method: :post },
+ font_weight: :bold,
+ display: :block,
+ mt: 3
+ ) do
+ t(:label_send_test_email)
+ end %>
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9be0da78640b..50fd1fb3094c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -116,9 +116,8 @@ en:
trial: "Trial"
jemalloc_allocator: Jemalloc memory allocator
journal_aggregation:
- explanation:
- text: "Individual actions of a user (e.g. updating a work package twice) are aggregated into a single action if their age difference is less than the specified timespan. They will be displayed as a single action within the application. This will also delay notifications by the same amount of time reducing the number of emails being sent and will also affect %{webhook_link} delay."
- link: "webhook"
+ caption: >
+ Individual actions of a user (e.g. updating a work package twice) are aggregated into a single action if their age difference is less than the specified timespan. They will be displayed as a single action within the application. This will also delay notifications by the same amount of time reducing the number of emails being sent and will also affect the [webhook](webhook_link) delay.
import:
title: "Import"
jira: