Skip to content

Commit 7d381b7

Browse files
committed
add reset smtp action
1 parent bba5626 commit 7d381b7

5 files changed

Lines changed: 25 additions & 7 deletions

File tree

app/controllers/email_smtp_settings_controller.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class EmailSmtpSettingsController < ApplicationController
44
before_action :load_encrypted_config
55
authorize_resource :encrypted_config, only: :index
6-
authorize_resource :encrypted_config, parent: false, only: :create
6+
authorize_resource :encrypted_config, parent: false, only: %i[create destroy]
77

88
def index; end
99

@@ -23,6 +23,12 @@ def create
2323
render :index, status: :unprocessable_content
2424
end
2525

26+
def destroy
27+
@encrypted_config.destroy!
28+
29+
redirect_to settings_email_index_path, notice: I18n.t('smtp_settings_have_been_reset')
30+
end
31+
2632
private
2733

2834
def load_encrypted_config

app/views/email_smtp_settings/index.html.erb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
<%= f.button button_title(title: t('save'), disabled_with: t('saving')), class: 'base-button' %>
5858
</div>
5959
<% end %>
60+
<% if Docuseal.multitenant? && @encrypted_config.persisted? %>
61+
<div class="flex justify-center pt-2">
62+
<%= button_to t('reset_default'), settings_email_path(@encrypted_config), method: :delete, class: 'link', data: { turbo_confirm: t('are_you_sure_') } %>
63+
</div>
64+
<% end %>
6065
</div>
6166
<div class="w-0 md:w-52"></div>
6267
</div>

app/views/shared/_settings_nav.html.erb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<li>
1313
<%= link_to t('account'), settings_account_path, class: 'text-base hover:bg-base-300' %>
1414
</li>
15+
<% if (!Docuseal.multitenant? || EncryptedConfig.exists?(key: EncryptedConfig::EMAIL_SMTP_KEY, account: current_account)) && can?(:read, EncryptedConfig.new(key: EncryptedConfig::EMAIL_SMTP_KEY, account: current_account)) && ENV['SMTP_ADDRESS'].blank? && true_user == current_user %>
16+
<li>
17+
<%= link_to t('email'), settings_email_index_path, class: 'text-base hover:bg-base-300' %>
18+
</li>
19+
<% end %>
1520
<% unless Docuseal.multitenant? %>
16-
<% if can?(:read, EncryptedConfig.new(key: EncryptedConfig::EMAIL_SMTP_KEY, account: current_account)) && ENV['SMTP_ADDRESS'].blank? && true_user == current_user %>
17-
<li>
18-
<%= link_to t('email'), settings_email_index_path, class: 'text-base hover:bg-base-300' %>
19-
</li>
20-
<% end %>
2121
<% if can?(:read, EncryptedConfig.new(key: EncryptedConfig::FILES_STORAGE_KEY, account: current_account)) && true_user == current_user && ENV['S3_ATTACHMENTS_BUCKET'].blank? && ENV['GCS_BUCKET'].blank? && ENV['AZURE_CONTAINER'].blank? %>
2222
<li>
2323
<%= link_to t('storage'), settings_storage_index_path, class: 'text-base hover:bg-base-300' %>

config/locales/i18n.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,7 @@ en: &en
899899
mobile: Mobile
900900
tablet: Tablet
901901
reset_default: Reset default
902+
smtp_settings_have_been_reset: SMTP settings have been reset.
902903
send_signature_request_email: Send signature request email
903904
last_3_months: Last 3 months
904905
last_6_months: Last 6 months
@@ -1975,6 +1976,7 @@ es: &es
19751976
mobile: Móvil
19761977
tablet: Tableta
19771978
reset_default: Restablecer por defecto
1979+
smtp_settings_have_been_reset: La configuración SMTP ha sido restablecida.
19781980
send_signature_request_email: Enviar correo de solicitud de firma
19791981
last_3_months: Últimos 3 meses
19801982
last_6_months: Últimos 6 meses
@@ -3051,6 +3053,7 @@ it: &it
30513053
mobile: Mobile
30523054
tablet: Tablet
30533055
reset_default: Reimposta predefinito
3056+
smtp_settings_have_been_reset: Le impostazioni SMTP sono state ripristinate.
30543057
send_signature_request_email: Invia email di richiesta firma
30553058
last_3_months: Ultimi 3 mesi
30563059
last_6_months: Ultimi 6 mesi
@@ -4123,6 +4126,7 @@ fr: &fr
41234126
mobile: Mobile
41244127
tablet: Tablette
41254128
reset_default: Réinitialiser par défaut
4129+
smtp_settings_have_been_reset: Les paramètres SMTP ont été réinitialisés.
41264130
send_signature_request_email: Envoyer un e-mail de demande de signature
41274131
last_month: Mois dernier
41284132
last_3_months: 3 derniers mois
@@ -5200,6 +5204,7 @@ pt: &pt
52005204
mobile: Celular
52015205
tablet: Tablet
52025206
reset_default: Redefinir para padrão
5207+
smtp_settings_have_been_reset: As configurações SMTP foram redefinidas.
52035208
send_signature_request_email: Enviar e-mail de solicitação de assinatura
52045209
last_3_months: Últimos 3 meses
52055210
last_6_months: Últimos 6 meses
@@ -6276,6 +6281,7 @@ de: &de
62766281
mobile: Mobil
62776282
tablet: Tablet
62786283
reset_default: Standard zurücksetzen
6284+
smtp_settings_have_been_reset: Die SMTP-Einstellungen wurden zurückgesetzt.
62796285
send_signature_request_email: Signaturanfrage-E-Mail senden
62806286
last_3_months: Letzte 3 Monate
62816287
last_6_months: Letzte 6 Monate
@@ -7753,6 +7759,7 @@ nl: &nl
77537759
mobile: Mobiel
77547760
tablet: Tablet
77557761
reset_default: Standaard herstellen
7762+
smtp_settings_have_been_reset: De SMTP-instellingen zijn hersteld.
77567763
send_signature_request_email: E-mail met handtekeningaanvraag verzenden
77577764
last_3_months: Afgelopen 3 maanden
77587765
last_6_months: Afgelopen 6 maanden

config/routes.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
resources :api, only: %i[index create], controller: 'api_settings'
190190
resource :reveal_access_token, only: %i[show create], controller: 'reveal_access_token'
191191
end
192-
resources :email, only: %i[index create], controller: 'email_smtp_settings'
192+
resources :email, only: %i[index create destroy], controller: 'email_smtp_settings'
193193
resources :sso, only: %i[index], controller: 'sso_settings'
194194
resources :notifications, only: %i[index create], controller: 'notifications_settings'
195195
resource :esign, only: %i[show create new update destroy], controller: 'esign_settings'

0 commit comments

Comments
 (0)