tramway-admin 4.1.0.1 → 4.1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b44fe24bffc41f9e73369d01d70066b3454fae31e483ba3b83b13a81efd0fbf
-  data.tar.gz: 21f8c5c22448dc3ac1df74ad91cfc8a1fa4ce82f684bcaf990cc1478549ccb87
+  metadata.gz: 1b095e980505070f6ddb9ded9968c7f198be43e2ae59780ebc40d3c3d36a82bf
+  data.tar.gz: c7f39e7067138cb066efcaf42ce749be48ecccd95ce069a76d1e6e2e0e0507af
 SHA512:
-  metadata.gz: 31923f43c6a572341ef1c5561630bae7358a6c943651ed044e45a2a03bdb53e1fe6d85d2cda346829219d14b7fb98c060b8266fa05dc6a84707721fca8621e4e
-  data.tar.gz: 5873f1f00d1eb3f989d42ac9a3767c38a211ca3b456072ddd6e2c5fed9bd4bf3d1eae7109801ae2902821d397ede0dfb9ad722f37d5e4e319a089ff0cebe4676
+  metadata.gz: df4321ccd6d3ed5de4c3ed66eedc911b9cbe62eab20b9d6a92c8662a0cebd16bc3489dc22ab16d8459b22b2bc25ca3ddbb3fecb36642068eab5ff3531d16906b
+  data.tar.gz: 75c1af828a91e189d14e929b1d6ae75a6cdf9d2cbb9291c502ddca3de52104f062f470dcaaa2347a1892605d4d9f80be379b99209b5f1f6dd44cdaa124edbc9c

data/README.md

@@ -574,6 +574,13 @@ end
 
 * **Model or Form is not available** - `params[:model]` or `params[:form]` is empty **OR** current user does not have access to model or form in `params[:model]` or `params[:form]`
 
+## Change admin user base model
+
+*config/initializers/tramway.rb*
+```ruby
+::Tramway::Admin.auth_config = { user_model: User, auth_attributes: %i[email username] }
+```
+
 ## Good features
 
 ### Get actions log in admin panel

data/app/controllers/tramway/admin/application_controller.rb

@@ -20,6 +20,10 @@ module Tramway
 
       protected
 
+      def admin_model
+        ::Tramway::Admin.admin_model
+      end
+
       def check_available!
         raise 'Tramway::Admin - Model or Form is not available. Looks like current user does not have access to change this model. Update your tramway initializer file' if !model_given? && !form_given?
       end
@@ -120,7 +124,7 @@ module Tramway
       end
 
       def current_admin
-        user = Tramway::User::User.find_by id: session[:admin_id]
+        user = admin_model.find_by id: session[:admin_id]
         return false unless user
 
         Tramway::User::UserDecorator.decorate user

data/app/controllers/tramway/admin/sessions_controller.rb

@@ -6,11 +6,11 @@ class Tramway::Admin::SessionsController < ::Tramway::Admin::ApplicationControll
   skip_before_action :collections_counts
 
   def new
-    @session_form = ::Tramway::Auth::SessionForm.new ::Tramway::User::User.new
+    @session_form = ::Tramway::Auth::SessionForm.new admin_model.new
   end
 
   def create
-    @session_form = ::Tramway::Auth::SessionForm.new ::Tramway::User::User.find_or_initialize_by email: params[:user][:email]
+    @session_form = ::Tramway::Auth::SessionForm.new admin_model.find_or_initialize_by email: params[:user][:email]
     if @session_form.validate params[:user]
       admin_sign_in @session_form.model
       redirect_to Tramway::Admin::Engine.routes.url_helpers.root_path

data/app/helpers/tramway/admin/application_helper.rb

@@ -29,7 +29,7 @@ module Tramway
       end
 
       def current_admin
-        user = Tramway::User::User.find_by id: session[:admin_id]
+        user = Tramway::Admin.admin_model.find_by id: session[:admin_id]
         return false unless user
 
         Tramway::User::UserDecorator.decorate user

data/app/views/layouts/tramway/admin/shared/_navbar.html.haml

@@ -1,5 +1,4 @@
 %nav.navbar.navbar-expand-md.navbar-dark.bg-dark
-  -# FIXME use helper methods
   - if ::Tramway::Admin.customized_admin_navbar.present?
     = ::Tramway::Admin.customized_admin_navbar
   - else
@@ -54,8 +53,6 @@
                   %span.badge.badge-light
                     = @notifications_count
           %li.nav-item
-            -# FIXME url_helpers return with /admin for some reason
-            -#= link_to Tramway::Auth::Engine.routes.url_helpers.session_path(model: Tramway::User::User).sub('/admin', ''), method: :delete, class: 'nav-link' do
             = link_to '/admin/sign_out', class: 'nav-link' do
               = fa_icon 'sign-out-alt'
               = t('helpers.links.sign_out')

data/app/views/tramway/admin/shared/_show.html.haml

@@ -10,7 +10,7 @@
         = link_to fa_icon('pencil-alt'), edit_path, class: 'btn btn-warning btn-xs'
         - if public_path(object)
           = link_to fa_icon(:share), public_path(object), class: 'btn btn-primary btn-xs'
-        - buttons = object.additional_buttons[:show]
+        - buttons = object.additional_buttons&.dig :show
         - buttons&.each do |button|
           - build_button button
 %hr

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '4.1.0.1'
+    VERSION = '4.1.1.2'
   end
 end

data/lib/tramway/admin.rb

@@ -79,6 +79,37 @@ module Tramway
           new_hash.merge! pair[0].to_s => pair[1]
         end
       end
+
+      def admin_model
+        auth_config.first[:user_model]
+      end
+
+      def auth_config
+        @@auth_config ||= [{ user_model: ::Tramway::User::User, auth_attributes: :email }]
+        @@auth_config
+      end
+
+      def auth_config=(params)
+        if params.is_a? Hash
+          @@auth_config = [params]
+        elsif params.is_a? Array
+          @@auth_config = params
+        end
+      end
+
+      def user_based_models
+        @@auth_config ||= []
+        @@auth_config.map do |conf|
+          conf[:user_model]
+        end
+      end
+
+      def auth_attributes
+        @@auth_config ||= []
+        @@auth_config.reduce({}) do |hash, conf|
+          hash.merge! conf[:user_model] => conf[:auth_attributes]
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 4.1.0.1
+  version: 4.1.1.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core