diff --git a/app/controllers/spree/admin/mail_methods_controller.rb b/app/controllers/spree/admin/mail_methods_controller.rb index 3bc52ce659..e95739148d 100644 --- a/app/controllers/spree/admin/mail_methods_controller.rb +++ b/app/controllers/spree/admin/mail_methods_controller.rb @@ -4,10 +4,6 @@ module Spree after_filter :initialize_mail_settings def update - if params[:smtp_password].blank? - params.delete(:smtp_password) - end - params.each do |name, value| next unless Spree::Config.has_preference? name diff --git a/app/views/spree/admin/mail_methods/_form.html.haml b/app/views/spree/admin/mail_methods/_form.html.haml index 670e37140e..02b7ea11dd 100644 --- a/app/views/spree/admin/mail_methods/_form.html.haml +++ b/app/views/spree/admin/mail_methods/_form.html.haml @@ -1,60 +1,28 @@ %div .row - .alpha.six.columns - %fieldset.no-border-bottom - %legend{align: "center"}= t("spree.general") - .field - = preference_field_tag("enable_mail_delivery", Spree::Config[:enable_mail_delivery], type: :boolean) - = label_tag :enable_mail_delivery, t("spree.enable_mail_delivery") - .field - = label_tag :mails_from, t("spree.send_mails_as") - %br/ - = text_field_tag :mails_from, Spree::Config[:mails_from], maxlength: 256, class: 'fullwidth' - %br/ - %span.info - = t("spree.smtp_send_all_emails_as_from_following_address") - .field - = label_tag :mail_bcc, t("spree.send_copy_of_all_mails_to") - %br/ - = text_field_tag :mail_bcc, Spree::Config[:mail_bcc], maxlength: 256, class: 'fullwidth' - %br/ - %span.info - = t("spree.smtp_send_copy_to_this_addresses") - .field - = label_tag :intercept_email, t("spree.intercept_email_address") - %br/ - = text_field_tag :intercept_email, Spree::Config[:intercept_email], maxlength: 256, class: 'fullwidth' - %br/ - %span.info - = t("spree.intercept_email_instructions") - .six.columns.omega - %fieldset.no-border-bottom - %legend{align: "center"}= t("spree.smtp") - .field - = label_tag :mail_domain, t("spree.smtp_domain") - %br/ - = text_field_tag :mail_domain, Spree::Config[:mail_domain], class: 'fullwidth' - .field - = label_tag :mail_host, t("spree.smtp_mail_host") - %br/ - = text_field_tag :mail_host, Spree::Config[:mail_host], class: 'fullwidth' - .field - = label_tag :mail_port, t("spree.smtp_port") - %br/ - = text_field_tag :mail_port, Spree::Config[:mail_port], class: 'fullwidth' - .field - = label_tag :secure_connection_type, t("spree.secure_connection_type") - %br/ - = select_tag(:secure_connection_type, options_from_collection_for_select(Spree::Core::MailSettings::SECURE_CONNECTION_TYPES.map{|w| Spree.t(w.downcase.to_sym, default: w)}, :to_s, :to_s, Spree::Config[:secure_connection_type]), class: 'select2 fullwidth') - .field - = label_tag :mail_auth_type, t("spree.smtp_authentication_type") - %br/ - = select_tag(:mail_auth_type, options_from_collection_for_select(Spree::Core::MailSettings::MAIL_AUTH.map{|w| Spree.t(w.downcase.to_sym, default: w)}, :to_s, :to_s, Spree::Config[:mail_auth_type]), class: 'select2 fullwidth') - .field - = label_tag :smtp_username, t("spree.smtp_username") - %br/ - = text_field_tag :smtp_username, Spree::Config[:smtp_username], class: 'fullwidth' - .field - = label_tag :preferred_smtp_password, t("spree.smtp_password") - %br/ - = password_field_tag :smtp_password, Spree::Config[:smtp_password], class: 'fullwidth' + %fieldset.no-border-bottom + %legend{align: "center"}= t("spree.general") + .field + = preference_field_tag("enable_mail_delivery", Spree::Config[:enable_mail_delivery], type: :boolean) + = label_tag :enable_mail_delivery, t("spree.enable_mail_delivery") + .field + = label_tag :mails_from, t("spree.send_mails_as") + %br/ + = text_field_tag :mails_from, Spree::Config[:mails_from], maxlength: 256, class: 'fullwidth' + %br/ + %span.info + = t("spree.smtp_send_all_emails_as_from_following_address") + .field + = label_tag :mail_bcc, t("spree.send_copy_of_all_mails_to") + %br/ + = text_field_tag :mail_bcc, Spree::Config[:mail_bcc], maxlength: 256, class: 'fullwidth' + %br/ + %span.info + = t("spree.smtp_send_copy_to_this_addresses") + .field + = label_tag :intercept_email, t("spree.intercept_email_address") + %br/ + = text_field_tag :intercept_email, Spree::Config[:intercept_email], maxlength: 256, class: 'fullwidth' + %br/ + %span.info + = t("spree.intercept_email_instructions") diff --git a/config/locales/en.yml b/config/locales/en.yml index 831dec00f8..da87782fb8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2978,14 +2978,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas." intercept_email_address: "Intercept Email Address" intercept_email_instructions: "Override email recipient and replace with this address." - smtp: "SMTP" - smtp_domain: "SMTP Domain" - smtp_mail_host: "SMTP Mail Host" - smtp_port: "SMTP Port" - secure_connection_type: "Secure Connection Type" - smtp_authentication_type: "SMTP Authentication Type" - smtp_username: "SMTP Username" - smtp_password: "SMTP Password" image_settings: "Image Settings" image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this." diff --git a/spec/features/admin/configuration/mail_methods_spec.rb b/spec/features/admin/configuration/mail_methods_spec.rb index 158e4e42a6..6ff8db2d6b 100644 --- a/spec/features/admin/configuration/mail_methods_spec.rb +++ b/spec/features/admin/configuration/mail_methods_spec.rb @@ -19,14 +19,5 @@ describe "Mail Methods" do click_button "Update" expect(page).to have_content("successfully updated!") end - - # Regression test for #2094 - it "does not clear password if not provided" do - Spree::Config[:smtp_password] = "haxme" - click_button "Update" - expect(page).to have_content("successfully updated!") - - expect(Spree::Config[:smtp_password]).not_to be_blank - end end end