From a6fe88b0f07eec377fc82ae7a4c5d3001c549219 Mon Sep 17 00:00:00 2001 From: rulingcom Date: Tue, 10 Dec 2024 23:07:54 +0800 Subject: [PATCH] Fix bug. --- app/views/admin/greeting_cards/_auto_send_setting.html.erb | 2 +- app/views/admin/greeting_cards/_greeting_card_setting.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/greeting_cards/_auto_send_setting.html.erb b/app/views/admin/greeting_cards/_auto_send_setting.html.erb index 79c69ac..e4404a9 100644 --- a/app/views/admin/greeting_cards/_auto_send_setting.html.erb +++ b/app/views/admin/greeting_cards/_auto_send_setting.html.erb @@ -15,7 +15,7 @@
- <%= f.check_box :automatically_send, {class: "automatically_send_enable toggle-check", title: t("greeting_card.enable"), "data-disabled": !(f.object.automatically_send), id: "automatically_send_#{id_postfix}"} %> + <%= f.check_box :automatically_send, {:class => "automatically_send_enable toggle-check", :title => t("greeting_card.enable"), "data-disabled" => !(f.object.automatically_send), :id => "automatically_send_#{id_postfix}"} %>
<%= f.hidden_field_tag "#{f.object_name}[auto_send_date_type]", "-1" %>
<%= t('mongoid.attributes.greeting_card_record.image') %>
diff --git a/app/views/admin/greeting_cards/_greeting_card_setting.html.erb b/app/views/admin/greeting_cards/_greeting_card_setting.html.erb index af17645..a7455e5 100644 --- a/app/views/admin/greeting_cards/_greeting_card_setting.html.erb +++ b/app/views/admin/greeting_cards/_greeting_card_setting.html.erb @@ -185,7 +185,7 @@ <% end %> <%= render :partial=> "form_images", locals: {f: f, greeting_card_setting: greeting_card_setting, is_default: is_default} %> - <% if !is_default %> + <% if !is_default && (greeting_card_setting != @default_greeting_card_setting) %> <%= render :partial=> "auto_send_setting", locals: {f: f} %> <% end %>