alchemy-devise 8.1.1 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b2649108be8e4999deee326d2222e5f799fd5eda0ad47f53ef96340b58fa2a
-  data.tar.gz: 8ea2edc4830c429a18657ebb0d7baf05710b663c96ceac0367a443f0230ebe6a
+  metadata.gz: 9cf0b606ca435cbea3b017b1585034201aa28e2bfbc20ec30533fa7cc4c23311
+  data.tar.gz: 9ec0a3c91ff2260c708dbda96aaee91d27d56688aaea1c8ed27136d2bdb2e8e2
 SHA512:
-  metadata.gz: 4c8830ceeb4119a108cceda886f14f6b77f2d8a0cf4c8bf3e458b00a3a0a90e6c73a4e06f1ff6f81c30a53a0f45ec67667b848f60fba8032cd78a8234005d07c
-  data.tar.gz: 262d849e42f6ea3993fd2af820ff987e832952e3c04d38630d290fa081bfc0964e9b8a7b495626f1bab5fb77f9e5be8b653f88711cb661face3511d0c04dd65d
+  metadata.gz: 8f9c7b8fb5f6dff4eb7671833a01a8071fea6af6fbb66b09909e78df1ec34fc04f6c81ecf3f0317563d9561a47a2592bcaaed2bd4777190de2bdf77181e5233f
+  data.tar.gz: 25bca78c7c9f51dc686b4c23d272b5af68256551a9c54b89f0b92a08525e737fac3e8c338421077ebb79efa80baa6d42e3a662b40b575a872e44d66dbdb6cec4

data/CHANGELOG.md

@@ -1,16 +1,28 @@
 # Changelog
 
-## 8.1.1 (2026-03-25)
+## 8.2.0 (2026-04-13)
 
-<!-- Release notes generated using configuration in .github/release.yml at 8.1-stable -->
+<!-- Release notes generated using configuration in .github/release.yml at main -->
 
 ## What's Changed
+### New Features
+* feat: Add timezone to users by @tvdeyen in https://github.com/AlchemyCMS/alchemy-devise/pull/269
+* feat: Add edit user link to user info by @tvdeyen in https://github.com/AlchemyCMS/alchemy-devise/pull/270
+### Bug Fixes
+* fix: remove duplicate pagination in users resource table by @blish-guenzler in https://github.com/AlchemyCMS/alchemy-devise/pull/256
+* Don't render link when user login is nil by @blish-guenzler in https://github.com/AlchemyCMS/alchemy-devise/pull/259
+* fix: user table pagination by @tvdeyen in https://github.com/AlchemyCMS/alchemy-devise/pull/265
+### Dependencies
+* Bump immutable from 4.3.6 to 4.3.8 by @dependabot[bot] in https://github.com/AlchemyCMS/alchemy-devise/pull/254
+* Bump picomatch from 2.3.1 to 2.3.2 by @dependabot[bot] in https://github.com/AlchemyCMS/alchemy-devise/pull/264
+* chore(deps): update local dev puma to 8.0 by @dependabot[bot] in https://github.com/AlchemyCMS/alchemy-devise/pull/271
 ### Other Changes
-* [8.1-stable] Merge pull request #256 from blish-guenzler/fix-double-pagination by @alchemycms-bot[bot] in https://github.com/AlchemyCMS/alchemy-devise/pull/258
-* [8.1-stable] Merge pull request #259 from blish-guenzler/fix-login-link-to-dialog by @alchemycms-bot[bot] in https://github.com/AlchemyCMS/alchemy-devise/pull/261
+* CI: Test Alchemy 8.2 by @tvdeyen in https://github.com/AlchemyCMS/alchemy-devise/pull/268
 
+## New Contributors
+* @blish-guenzler made their first contribution in https://github.com/AlchemyCMS/alchemy-devise/pull/256
 
-**Full Changelog**: https://github.com/AlchemyCMS/alchemy-devise/compare/v8.1.0...v8.1.1
+**Full Changelog**: https://github.com/AlchemyCMS/alchemy-devise/compare/v8.1.1...v8.2.0
 
 ## 8.1.0 (2026-02-02)
 
@@ -35,6 +47,7 @@
 
 **Full Changelog**: https://github.com/AlchemyCMS/alchemy-devise/compare/v8.0.0...v8.1.0
 
+
 ## 8.0.0 (2025-11-28)
 
 - Enable rememberable module [#237](https://github.com/AlchemyCMS/alchemy-devise/pull/237) ([tvdeyen](https://github.com/tvdeyen))

data/app/models/alchemy/user.rb

@@ -14,7 +14,8 @@ module Alchemy
       :password,
       :password_confirmation,
       :send_credentials,
-      :tag_list
+      :tag_list,
+      :timezone
     ]
 
     devise(*Alchemy::Devise.config.devise_modules)

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

@@ -1,7 +1,7 @@
 <%= f.input :firstname, input_html: {autocomplete: "given-name"} %>
 <%= f.input :lastname, input_html: {autocomplete: "family-name"} %>
-<%= f.input :login, autofocus: true, required: @user.login_required?, input_html: {autocomplete: "username"} %>
-<%= f.input :email, required: @user.email_required?, input_html: {autocomplete: "email"} %>
+<%= f.input :login, autofocus: true, required: f.object.login_required?, input_html: {autocomplete: "username"} %>
+<%= f.input :email, required: f.object.email_required?, input_html: {autocomplete: "email"} %>
 <% if Alchemy::I18n.available_locales.many? %>
   <div class="input select">
     <%= f.label(:language) %>
@@ -10,9 +10,15 @@
 <% end %>
 <%= f.input :password, required: while_signup?, input_html: {autocomplete: "new-password"} %>
 <%= f.input :password_confirmation, required: while_signup?, input_html: {autocomplete: "new-password"} %>
-<% if can_update_role? %>
+<%= f.input :timezone,
+  collection: ActiveSupport::TimeZone.all, label_method: :to_s, value_method: :name,
+  input_html: {
+    is: "alchemy-select",
+    data: {allow_clear: true}
+  } %>
+<% if local_assigns[:user_roles] && can_update_role? %>
   <%= f.input :alchemy_roles,
-    collection: @user_roles,
+    collection: user_roles,
     input_html: {
       multiple: true,
       is: 'alchemy-select',
@@ -26,7 +32,7 @@
     <%= f.label :tag_list %>
     <%= render 'alchemy/admin/partials/autocomplete_tag_list',
       f: f,
-      object: @user %>
+      object: f.object %>
   </div>
 <% end %>
 <%= f.input :send_credentials, as: 'boolean' %>

data/app/views/alchemy/admin/users/_resource_table.html.erb

@@ -1,4 +1,4 @@
-<%= render Alchemy::Admin::Resource::Table.new(@users, query: @query) do |table| %>
+<%= render Alchemy::Admin::Resource::Table.new(users, query: query) do |table| %>
   <% table.icon_column do |user| %>
     <%= render_icon(:user, style: user.logged_in? ? "solid" : "regular") %>
   <% end %>
@@ -8,7 +8,7 @@
         alchemy.edit_admin_user_path(user), {
           title: Alchemy.t(:edit_user),
           overflow: true,
-          size: "430x500"
+          size: "430x530"
         },
         title: Alchemy.t(:edit_user) %>
     <% else %>
@@ -28,5 +28,5 @@
     <%= user.human_roles_string %>
   <% end %>
   <% table.delete_button tooltip: Alchemy.t(:delete_user), confirm_message: Alchemy.t(:confirm_to_delete_user) %>
-  <% table.edit_button tooltip: Alchemy.t(:edit_user), dialog_size: "430x500" %>
+  <% table.edit_button tooltip: Alchemy.t(:edit_user), dialog_size: "430x530" %>
 <% end %>

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

@@ -1,3 +1,22 @@
-<%= alchemy_form_for [:admin, @user] do |f| %>
-  <%= render 'fields', f: f %>
+<% if request.xhr? || turbo_frame_request? %>
+  <%= alchemy_form_for [:admin, @user] do |f| %>
+    <%= render "fields", f: f, user_roles: @user_roles %>
+  <% end %>
+<% else %>
+  <%= content_for :toolbar do %>
+    <sl-tooltip content="<%= Alchemy.t(:back) %>">
+      <%= link_to request.referer || alchemy.admin_dashboard_path, class: "icon_button" do %>
+        <alchemy-icon name="arrow-left-s"></alchemy-icon>
+      <% end %>
+    </sl-tooltip>
+  <% end %>
+
+  <div class="panel">
+    <alchemy-message type="info">
+      <%= Alchemy.t(:edit_user) %>
+    </alchemy-message>
+    <%= alchemy_form_for [:admin, @user] do |f| %>
+      <%= render "fields", f: f, user_roles: @user_roles %>
+    <% end %>
+  </div>
 <% end %>

data/app/views/alchemy/admin/users/index.html.erb

@@ -12,7 +12,7 @@
     tooltip_placement: "top-start",
     dialog_options: {
       title: Alchemy.t(:create_user),
-      size: "430x500"
+      size: "430x530"
     },
     if_permitted_to: [:create, Alchemy::User]
   ) %>
@@ -22,10 +22,8 @@
 <div id="archive_all" class="resources-table-wrapper">
 <% if @users.any? %>
   <%= render "alchemy/admin/resources/table_header" %>
-  <%= render "resource_table" %>
-
-  <%= paginate @users, theme: 'alchemy' %>
-
+  <%= render "resource_table", users: @users, query: @query %>
+  <%= render "alchemy/admin/resources/pagination", resources: @users %>
 <% elsif params[:query] %>
 
   <div class="info">

data/app/views/alchemy/admin/users/new.html.erb

@@ -1,3 +1,3 @@
 <%= alchemy_form_for [:admin, @user] do |f| %>
-  <%= render 'fields', f: f %>
+  <%= render 'fields', f: f, user_roles: @user_roles %>
 <% end %>

data/config/initializers/alchemy.rb

@@ -19,4 +19,5 @@ Rails.application.config.to_prepare do
   Alchemy.config.login_path = "/admin/login"
   Alchemy.config.logout_path = "/admin/logout"
   Alchemy.config.logout_method = Devise.sign_out_via.to_s
+  Alchemy.config.edit_user_path = "/admin/users/:id/edit"
 end

data/db/migrate/20260410115756_add_timezone_to_alchemy_users.rb

@@ -0,0 +1,6 @@
+class AddTimezoneToAlchemyUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :alchemy_users, :timezone, :string, if_not_exists: true,
+      comment: "The timezone of the user, used for displaying dates in the user's timezone"
+  end
+end

data/lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "8.1.1"
+    VERSION = "8.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.1.0.a
+        version: 8.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.1.0.a
+        version: 8.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -236,6 +236,7 @@ files:
 - db/migrate/20131225232042_add_alchemy_roles_to_alchemy_users.rb
 - db/migrate/20141209144532_add_indexes_to_alchemy_users.rb
 - db/migrate/20251127170649_add_rememberable_column.rb
+- db/migrate/20260410115756_add_timezone_to_alchemy_users.rb
 - lib/alchemy/devise.rb
 - lib/alchemy/devise/configuration.rb
 - lib/alchemy/devise/engine.rb