Skip to content

Commit eee3e98

Browse files
committed
chore: Pass locals instead of ivars
This fixes a Herb linter issue. Signed-off-by: Thomas von Deyen <thomas@vondeyen.com>
1 parent 368a88d commit eee3e98

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

app/views/alchemy/admin/users/_fields.html.erb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%= f.input :firstname, input_html: {autocomplete: "given-name"} %>
22
<%= f.input :lastname, input_html: {autocomplete: "family-name"} %>
3-
<%= f.input :login, autofocus: true, required: @user.login_required?, input_html: {autocomplete: "username"} %>
4-
<%= f.input :email, required: @user.email_required?, input_html: {autocomplete: "email"} %>
3+
<%= f.input :login, autofocus: true, required: f.object.login_required?, input_html: {autocomplete: "username"} %>
4+
<%= f.input :email, required: f.object.email_required?, input_html: {autocomplete: "email"} %>
55
<% if Alchemy::I18n.available_locales.many? %>
66
<div class="input select">
77
<%= f.label(:language) %>
@@ -16,9 +16,9 @@
1616
is: "alchemy-select",
1717
data: {allow_clear: true}
1818
} %>
19-
<% if can_update_role? %>
19+
<% if local_assigns[:user_roles] && can_update_role? %>
2020
<%= f.input :alchemy_roles,
21-
collection: @user_roles,
21+
collection: user_roles,
2222
input_html: {
2323
multiple: true,
2424
is: 'alchemy-select',
@@ -32,7 +32,7 @@
3232
<%= f.label :tag_list %>
3333
<%= render 'alchemy/admin/partials/autocomplete_tag_list',
3434
f: f,
35-
object: @user %>
35+
object: f.object %>
3636
</div>
3737
<% end %>
3838
<%= f.input :send_credentials, as: 'boolean' %>

app/views/alchemy/admin/users/edit.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<% if request.xhr? || turbo_frame_request? %>
22
<%= alchemy_form_for [:admin, @user] do |f| %>
3-
<%= render 'fields', f: f %>
3+
<%= render "fields", f: f, user_roles: @user_roles %>
44
<% end %>
55
<% else %>
66
<%= content_for :toolbar do %>
@@ -16,7 +16,7 @@
1616
<%= Alchemy.t(:edit_user) %>
1717
</alchemy-message>
1818
<%= alchemy_form_for [:admin, @user] do |f| %>
19-
<%= render 'fields', f: f %>
19+
<%= render "fields", f: f, user_roles: @user_roles %>
2020
<% end %>
2121
</div>
2222
<% end %>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<%= alchemy_form_for [:admin, @user] do |f| %>
2-
<%= render 'fields', f: f %>
2+
<%= render 'fields', f: f, user_roles: @user_roles %>
33
<% end %>

0 commit comments

Comments
 (0)