From cf77d938f8fff0193225781f77f03e1616acc88f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 13 Nov 2022 03:33:31 +0100
Subject: Fix saving server registration settings redirecting to branding
 settings (#20505)

---
 app/views/admin/settings/registrations/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml
index 0129332d7..0db9f3536 100644
--- a/app/views/admin/settings/registrations/show.html.haml
+++ b/app/views/admin/settings/registrations/show.html.haml
@@ -8,7 +8,7 @@
   %h2= t('admin.settings.title')
   = render partial: 'admin/settings/shared/links'
 
-= simple_form_for @admin_settings, url: admin_settings_branding_path, html: { method: :patch } do |f|
+= simple_form_for @admin_settings, url: admin_settings_registrations_path, html: { method: :patch } do |f|
   = render 'shared/error_messages', object: @admin_settings
 
   %p.lead= t('admin.settings.registrations.preamble')
-- 
cgit 


From 3d3bd344cb30929756e4b6ddcadddb20e16d172f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 13 Nov 2022 20:58:54 +0100
Subject: Fix announcement dates not being validated client-side (#20577)

---
 app/views/admin/announcements/edit.html.haml | 2 +-
 app/views/admin/announcements/new.html.haml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/views')

diff --git a/app/views/admin/announcements/edit.html.haml b/app/views/admin/announcements/edit.html.haml
index e20a839b9..66c8d31a7 100644
--- a/app/views/admin/announcements/edit.html.haml
+++ b/app/views/admin/announcements/edit.html.haml
@@ -4,7 +4,7 @@
 - content_for :header_tags do
   = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
-= simple_form_for @announcement, url: admin_announcement_path(@announcement) do |f|
+= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |f|
   = render 'shared/error_messages', object: @announcement
 
   .fields-group
diff --git a/app/views/admin/announcements/new.html.haml b/app/views/admin/announcements/new.html.haml
index d5881b7aa..57b7d5e0c 100644
--- a/app/views/admin/announcements/new.html.haml
+++ b/app/views/admin/announcements/new.html.haml
@@ -4,7 +4,7 @@
 - content_for :header_tags do
   = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
-= simple_form_for @announcement, url: admin_announcements_path do |f|
+= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |f|
   = render 'shared/error_messages', object: @announcement
 
   .fields-group
-- 
cgit