From 4581edd78ae9e8d1cf1f7aa4fdcec63f037ea477 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 17 Jul 2025 13:41:53 +0200
Subject: [PATCH 1/2] Fix start due date in serializer [SCI-12130]

---
 app/serializers/lists/experiment_serializer.rb | 18 ++++--------------
 .../lists/project_and_folder_serializer.rb     |  4 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/serializers/lists/experiment_serializer.rb b/app/serializers/lists/experiment_serializer.rb
index 1fd5a52f6..5f68c2f02 100644
--- a/app/serializers/lists/experiment_serializer.rb
+++ b/app/serializers/lists/experiment_serializer.rb
@@ -102,8 +102,8 @@ module Lists
 
     def due_date_cell
       {
-        value: due_date,
-        value_formatted: due_date,
+        value: object.due_date,
+        value_formatted: (I18n.l(object.due_date, format: :full_date) if object.due_date),
         editable: can_manage_experiment?(object),
         icon: (if object.one_day_prior? && !object.done?
                  'sn-icon sn-icon-alert-warning text-sn-alert-brittlebush'
@@ -115,8 +115,8 @@ module Lists
 
     def start_date_cell
       {
-        value: start_date,
-        value_formatted: start_date,
+        value: object.start_date,
+        value_formatted: (I18n.l(object.start_date, format: :full_date) if object.start_date),
         editable: can_manage_experiment?(object)
       }
     end
@@ -126,15 +126,5 @@ module Lists
         manage: can_manage_experiment?(object)
       }
     end
-
-    private
-
-    def due_date
-      I18n.l(object.due_date, format: :full_date) if object.due_date
-    end
-
-    def start_date
-      I18n.l(object.start_date, format: :full_date) if object.start_date
-    end
   end
 end
diff --git a/app/serializers/lists/project_and_folder_serializer.rb b/app/serializers/lists/project_and_folder_serializer.rb
index 9765601e2..d9b686bb8 100644
--- a/app/serializers/lists/project_and_folder_serializer.rb
+++ b/app/serializers/lists/project_and_folder_serializer.rb
@@ -106,7 +106,7 @@ module Lists
     def due_date_cell
       if project?
         {
-          value: (I18n.l(object.due_date, format: :default) if object.due_date),
+          value: object.due_date,
           value_formatted: (I18n.l(object.due_date, format: :full_date) if object.due_date),
           editable: can_manage_project?(@object),
           icon: (if object.one_day_prior? && !object.done?
@@ -121,7 +121,7 @@ module Lists
     def start_date_cell
       if project?
         {
-          value: (I18n.l(object.start_date, format: :default) if object.start_date),
+          value: object.start_date,
           value_formatted: (I18n.l(object.start_date, format: :full_date) if object.start_date),
           editable: can_manage_project?(@object)
         }

From 2bc84a71eb39096f2d008be754efce6c1f787704 Mon Sep 17 00:00:00 2001
From: Andrej <andrej@scinote.net>
Date: Thu, 24 Jul 2025 12:22:08 +0200
Subject: [PATCH 2/2] Fix password reset for core [SCI-12091]

---
 app/controllers/users/passwords_controller.rb | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb
index 9b9644ab8..f10e61f31 100644
--- a/app/controllers/users/passwords_controller.rb
+++ b/app/controllers/users/passwords_controller.rb
@@ -5,9 +5,19 @@ class Users::PasswordsController < Devise::PasswordsController
   # end
 
   # POST /resource/password
-  # def create
-  #   super
-  # end
+  def create
+    self.resource = resource_class.send_reset_password_instructions(resource_params)
+    yield resource if block_given?
+
+    if resource.errors.added?(:email, :blank)
+      flash.now[:alert] = I18n.t('devise.errors.email.empty')
+      self.resource = resource_class.new
+      render :new
+    else
+      set_flash_message!(:notice, :send_instructions)
+      respond_with({}, location: after_sending_reset_password_instructions_path_for(resource_name))
+    end
+  end
 
   # GET /resource/password/edit?reset_password_token=abcdef
   # def edit