From 6160ea8d78dd01add456a7576f8fa376073026a1 Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Thu, 27 Nov 2025 19:16:00 +0100 Subject: [PATCH] use different ids for login form inputs in pulldown --- app/forms/login_form.rb | 6 +++++- app/views/account/_login.html.erb | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/forms/login_form.rb b/app/forms/login_form.rb index 26fa8bac351..2e9d7cc1dfb 100644 --- a/app/forms/login_form.rb +++ b/app/forms/login_form.rb @@ -37,6 +37,7 @@ class LoginForm < ApplicationForm f.text_field( name: :username, + id: "username#{@id_suffix}", value: @username, autofocus: @username.blank?, label: User.human_attribute_name(:login), @@ -46,6 +47,7 @@ class LoginForm < ApplicationForm f.text_field( name: :password, + id: "password#{@id_suffix}", type: :password, autofocus: @username.present?, label: User.human_attribute_name(:password), @@ -55,6 +57,7 @@ class LoginForm < ApplicationForm if Setting::Autologin.enabled? f.check_box name: "autologin", + id: "autologin#{@id_suffix}", checked: false, value: 1, label: I18n.t("users.autologins.prompt", @@ -85,9 +88,10 @@ class LoginForm < ApplicationForm end end - def initialize(back_url: nil, username: nil) + def initialize(back_url: nil, username: nil, id_suffix: nil) super() @back_url = back_url @username = username + @id_suffix = id_suffix end end diff --git a/app/views/account/_login.html.erb b/app/views/account/_login.html.erb index 28dce5f9666..b81a0a0dab7 100644 --- a/app/views/account/_login.html.erb +++ b/app/views/account/_login.html.erb @@ -33,7 +33,14 @@ See COPYRIGHT and LICENSE files for more details. url: { controller: "/account", action: "login" }, method: :post ) do |form_builder| - render(LoginForm.new(form_builder, back_url: back_url_to_current_page, username: params[:username])) + render( + LoginForm.new( + form_builder, + back_url: back_url_to_current_page, + username: params[:username], + id_suffix: "-pulldown" + ) + ) end %>