trusty-cms 7.0.30 → 7.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef6650284d438676ef388a1b002d3ff0acfe81dc068bcfafa9e1cb2814749f9
-  data.tar.gz: e6a980c1afa8435a04314a5b43b6788ecc4f743e9c7c32015245e15e0c8c0804
+  metadata.gz: b6638d8ed6e3b9f192675721e595bc6ed217eed616e2e3b869531b405b4afe32
+  data.tar.gz: 4cf9d0d42e6549677a391b661c95214071a1ca1e38d5e00e58e83e966946e89f
 SHA512:
-  metadata.gz: 33d9139d690d376c8d4547b3d8c20cec750671050a9aa9378a197c3c28ab79cb04fda4403b17f2da86bdad23c5699d3dfdeef5f16db1469ad17c546464df89b8
-  data.tar.gz: f728eb8f4da2af5477ba994c9ccad2d5ac46620f0893295734a66035601c2317dc750985ec3b9d52518c786eebd1f5056a4f8dd301cb2beb4001f82e7d96835c
+  metadata.gz: 5869e4913fa6901c264e224fc8fe5da3f32758f2a8b371fe6e74b3e93f7e2be45b4945733afc32681e79a7bd9c6ae2fe74f91f3189405ef17d2f5e58fe241900
+  data.tar.gz: 2c5eb337819e07bda79023a9c969c4f277253013a5e1881dc2efd23f4d9ac4235fe1490dd81d391cc249abecf26e1b33e44b8fab6940763fe218251d1ac3cace

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.30)
+    trusty-cms (7.0.31)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

data/app/assets/stylesheets/admin/partials/_preferences.scss

@@ -24,7 +24,7 @@
   }
 }
 
-#display_password {
+#display-password {
   .button {
     display: block;
     max-width: fit-content;

data/app/views/admin/configuration/show.html.haml

@@ -19,7 +19,7 @@
         %span
           = current_user.locale
       .actions
-        = button_to t("edit_preferences"), edit_admin_user_path(current_user), :method => :get
+        = button_to t("edit_preferences"), admin_preferences_path, :method => :get
 
 %fieldset
   - render_region :user do |user|

data/app/views/admin/users/_form.html.haml

@@ -15,6 +15,9 @@
       = f.label :email, t('email_address') , :class => 'optional'
       = f.text_field 'email', :class => 'textbox', :maxlength => 255
 
+    - form.edit_password do
+      = render 'password_fields', :f => f
+
     - form.edit_roles do
       - if current_user.admin?
         %fieldset.multi_option

data/app/views/admin/users/_password_fields.html.haml

@@ -0,0 +1,14 @@
+%fieldset#display-password{ :style => (@user.new_record? or !@user.valid?) ? 'display: none' : nil }
+  %label= t('password')
+  %a.button{ :href => '#', :onclick => "$('#display-password').hide(); $('#change-password').show()" }= t('change')
+%fieldset#change-password{ :style => (!@user.new_record? && @user.valid?) ? 'display: none' : nil }
+  %p
+    = f.label :password, t('new_password')
+    = f.password_field 'password', :value => '', :maxlength => 40, :autocomplete => 'new-password'
+  %p
+    = f.label :password_confirmation, t('password_confirmation')
+    = f.password_field 'password_confirmation', :value => '', :maxlength => 40, :autocomplete => 'new-password'
+    - unless @user.new_record?
+      %span
+        = t('or')
+        %a{ :href => '#', :class => 'cancel-button', :onclick => " $('#display-password').show(); $('#change-password').hide()" }= t('cancel', class: 'alt')

data/lib/trusty_cms/admin_ui.rb

@@ -70,7 +70,8 @@ module TrustyCms
       end
 
       def deprecated_add(name, url, caller)
-        ActiveSupport::Deprecation.warn("admin.tabs.add is no longer supported in TrustyCms 0.9.x.  Please update your code to use: \ntab \"Content\" do\n\tadd_item(...)\nend", caller)
+        ActiveSupport::Deprecation.warn("admin.tabs.add is no longer supported in TrustyCms 0.9.x.  Please update your code to use: \ntab \"Content\" do\n\tadd_item(...)\nend",
+                                        caller)
         NavSubItem.new(name, url)
       end
     end
@@ -201,7 +202,7 @@ module TrustyCms
         end
         user.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form}
-          edit.form.concat %w{edit_first_name edit_last_name edit_email edit_roles edit_notes}
+          edit.form.concat %w{edit_first_name edit_last_name edit_email edit_password edit_roles edit_notes}
           edit.form_bottom.concat %w{edit_buttons edit_timestamp}
         end
         user.index = RegionSet.new do |index|

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.30'.freeze
+  VERSION = '7.0.31'.freeze
 end

data/vendor/extensions/multi-site-extension/lib/multi_site/pages_controller_extensions.rb

@@ -10,7 +10,7 @@ module MultiSite::PagesControllerExtensions
       alias_method :remove, :remove_with_back
       responses.destroy.default do
         session[:came_from] = nil
-        redirect_to admin_pages_url(site_id: model.site.id)
+        redirect_to admin_pages_path
       end
     }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.30
+  version: 7.0.31
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-19 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -908,6 +908,7 @@ files:
 - app/views/admin/two_factor/show.html.haml
 - app/views/admin/users/_choose_site.html.haml
 - app/views/admin/users/_form.html.haml
+- app/views/admin/users/_password_fields.html.haml
 - app/views/admin/users/edit.html.haml
 - app/views/admin/users/index.html.haml
 - app/views/admin/users/new.html.haml