tramway-admin 4.1 → 4.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78639584bbf4b055028b8d32816434c049812c9aa8711fdfcc4c988b22e4d28a
-  data.tar.gz: fd5f663efbceab4b1ac6aa2276488a2b7f5b287db196564b72419da25f1f2743
+  metadata.gz: 6c2958bb2c4d589dbd96ba4fda743bf07db1c9edfa2ac2eeb76a9bd9abdaa752
+  data.tar.gz: bc0e26d6d14388987f8d1b107013553ed29f9b29c9cb11a9d4f4cde288fdbc11
 SHA512:
-  metadata.gz: d18a9fcb50694c039bfa5bcd702391260312cdc88eaa45922d35564b0a34cdda6049f55299d482a5dfb71ccbc4d3d38407a17156cdcf9705ab89fa6f89a35226
-  data.tar.gz: 1b8472ecb0adb65f49146cb5896d1757e82e96e07a3ede8c191bcc3f31ceaf0ab3444430b0a9e023dd8179032338b94ebfc975dae7529e81e4e665fe4c31e9a3
+  metadata.gz: 48586d888af6d540411509a5b60941a8a05c76d5178158a6366118de16bdd0300bf109e6232ec63b40b02de1ac96a30ad28a87db58c9f6d3d94b1fba30013833
+  data.tar.gz: 14ad23a6e151bf9c86e390e2b8b14ab7bc04e3bdbd0cf166e25e5425bd01ada302d5ffcf08b487410ec57eccee4365e611d7ef0dc2fc2c0686fce39801d4c782

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/records/_search.html.haml

@@ -3,8 +3,9 @@
     .d-flex.flex-row-reverse.filters
       = form_tag records_path, class: 'form-inline', method: :get do |f|
         - if searchable_model?(model_class)
-          .col-md-8
+          .input-group
             = text_field_tag :search, params[:search], class: 'text form-control'
+            = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'
         = hidden_field_tag :model, params[:model]
         = hidden_field_tag :scope, params[:scope]
         = hidden_field_tag :filter, (params[:filter].is_a?(ActionController::Parameters) ? params[:filter].permit!.to_h.to_json : params[:filter])
@@ -31,5 +32,3 @@
                     $('#filter_datepicker_begin_date').datepicker();
                     $('#filter_datepicker_end_date').datepicker();
                   });
-        .col-md-4.submit
-          = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'

data/app/views/tramway/admin/records/index.html.haml

@@ -15,7 +15,7 @@
     .col
       = render 'search', model_class: model_class
 %hr
-%ul.nav.nav-tabs
+%ul.nav.nav-tabs.mb-3
   - if params[:search].present?
     %li.nav-item
       = link_to search_tab_title(@records.total_count), '#', class: 'nav-link active'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '4.1'
+    VERSION = '4.1.1.1'
   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'
+  version: 4.1.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core