From 36128a2fe37181bf68e1add6abf8a709d806523a Mon Sep 17 00:00:00 2001
From: kumojima
Date: Fri, 30 Jun 2023 01:53:03 +0000
Subject: Patch for fix_save_button
---
app/views/custom_fields/_form.html.erb | 11 ++++++++++-
app/views/trackers/_form.html.erb | 3 ++-
app/views/users/_form.html.erb | 8 ++++++++
app/views/users/_general.html.erb | 2 +-
app/views/users/new.html.erb | 2 +-
5 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
index a7af54a07..9e544339f 100644
--- a/app/views/custom_fields/_form.html.erb
+++ b/app/views/custom_fields/_form.html.erb
@@ -20,7 +20,7 @@
<%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
-
+
<% if @custom_field.new_record? %>
<%= submit_tag l(:button_create) %>
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
@@ -65,4 +65,13 @@
+
+ <% if @custom_field.new_record? %>
+ <%= submit_tag l(:button_create) %>
+ <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+ <% else %>
+ <%= submit_tag l(:button_save) %>
+ <% end %>
+
+
<% include_calendar_headers_tags %>
diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb
index 2ccd225e6..7118a486d 100644
--- a/app/views/trackers/_form.html.erb
+++ b/app/views/trackers/_form.html.erb
@@ -43,7 +43,7 @@
<% end %>
-<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save) %>
+<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save), class: "mobile-hide" %>
@@ -58,3 +58,4 @@ end %>
<% end %>
+<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save), class: "mobile-show" %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 6d6058c49..2f7c73484 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -55,6 +55,14 @@
<% end -%>
+
+ <% if @user.new_record? %>
+ <%= submit_tag l(:button_create) %>
+ <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+ <% else %>
+ <%= submit_tag l(:button_save) %>
+ <% end %>
+
diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb
index c9398577c..9bb72ce97 100644
--- a/app/views/users/_general.html.erb
+++ b/app/views/users/_general.html.erb
@@ -3,5 +3,5 @@
<% if @user.active? && email_delivery_enabled? && @user != User.current -%>
<% end -%>
-
<%= submit_tag l(:button_save) %>
+
<%= submit_tag l(:button_save) %>
<% end %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index f65bea1f2..ce246fd51 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -5,7 +5,7 @@
<% if email_delivery_enabled? %>
<% end %>
-
+
<%= submit_tag l(:button_create) %>
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
--
2.41.0