tramway-admin 1.20 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 702d94df42264ec7071d530f1ebc90de8ac9aaf381509476b1cb0b3b4761bdfb
-  data.tar.gz: ba7ef0a0220664b4db23509cd29a445cc29c7c7ac39a6ab799a8fe43370fa38c
+  metadata.gz: 6aee5db3732b7fc7b50bd8f3ea9c8c0a3995c2b8c672cad75f81835e67672a58
+  data.tar.gz: 65d394e432da53939aa369352bea71ce381a01bc13d5520eba4998e9680a3571
 SHA512:
-  metadata.gz: 007abdd45e940b99aca62a1b0ef3ec6106d9be2a039f2f4a426adb510edd6efb8915ddda257d6d0939edb672427982a6df36b637c7f90b11a7442a768a544dd7
-  data.tar.gz: 60e457aad9172456e90dc276588cd9b80179facd370441e550349c678eba13d108be043a4fa62e63ff2a96523e67a470b5ddd3af4c87e7d12d519b76dff85bf2
+  metadata.gz: bf76db73861ba917c79e4e876c2e6570d323d9e58fc25e3428106ddff283e3bb4ce9b07688e88f15ea4112462a2c07f1be539880585fc4efda30cca339f98888
+  data.tar.gz: 0bd22bce1018e38c3905239e57652148530f8230bd0310246b568d19162e834d0788582a461aa624ff050a280e2b36e7911f635bd14264c3998046653d88ada8

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

@@ -32,7 +32,7 @@ module Tramway
       def collections_counts
         @counts = decorator_class.collections.reduce({}) do |hash, collection|
           records = model_class.active.send(collection)
-          records = records.send "#{current_user.role}_scope", current_user.id unless current_user.role.admin?
+          records = records.send "#{current_user.role}_scope", current_user.id
           hash.merge! collection => records.count
         end
       end
@@ -44,7 +44,9 @@ module Tramway
       end
 
       def notifications
-        @notifications ||= Tramway::Admin.notifications
+        @notifications ||= Tramway::Admin.notificable_queries&.reduce({}) do |hash, notification|
+          hash.merge! notification[0] => notification[1].call(current_user)
+        end
         @notifications
       end
 

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

@@ -6,7 +6,7 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
     records = model_class.active.order(id: :desc).send scope
     records = records.full_text_search params[:search] if params[:search]
     records = records.ransack(params[:filter]).result if params[:filter].present?
-    records = records.send "#{current_user.role}_scope", current_user.id unless current_user.role.admin?
+    records = records.send "#{current_user.role}_scope", current_user.id
     @records = decorator_class.decorate records.page params[:page]
   end
 

data/app/models/tramway/user/user.rb

@@ -3,7 +3,7 @@
 class Tramway::User::User < ::Tramway::Core::ApplicationRecord
   has_secure_password # FIXME: remove repeating from tramway-user
 
-  enumerize :role, in: %i[user admin], default: :user
+  enumerize :role, in: %i[user admin], default: :admin
 
   def admin?
     role.admin?

data/lib/tramway/admin.rb

@@ -4,6 +4,7 @@ require 'tramway/admin/engine'
 require 'tramway/admin/singleton_models'
 require 'tramway/admin/records_models'
 require 'tramway/admin/additional_buttons'
+require 'tramway/admin/notifications'
 require 'tramway/error'
 
 module Tramway
@@ -11,10 +12,10 @@ module Tramway
 
   module Admin
     class << self
-
       include ::Tramway::Admin::RecordsModels
       include ::Tramway::Admin::SingletonModels
       include ::Tramway::Admin::AdditionalButtons
+      include ::Tramway::Admin::Notifications
 
       attr_reader :customized_admin_navbar
 
@@ -30,17 +31,6 @@ module Tramway
       def get_models_by_key(checked_models, project, role)
         checked_models && checked_models != [] && checked_models[project][role] || []
       end
-
-      def set_notificable_queries(**queries)
-        @notificable_queries ||= {}
-        @notificable_queries.merge! queries
-      end
-
-      def notifications
-        @notificable_queries&.reduce({}) do |hash, notification|
-          hash.merge! notification[0] => notification[1].call
-        end
-      end
     end
   end
 end

data/lib/tramway/admin/notifications.rb

@@ -0,0 +1,10 @@
+module Tramway::Admin::Notifications
+  def set_notificable_queries(**queries)
+    @notificable_queries ||= {}
+    @notificable_queries.merge! queries
+  end
+
+  def notificable_queries
+    @notificable_queries
+  end
+end

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.20'
+    VERSION = '1.20.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: '1.20'
+  version: 1.20.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -270,6 +270,7 @@ files:
 - lib/tramway/admin.rb
 - lib/tramway/admin/additional_buttons.rb
 - lib/tramway/admin/engine.rb
+- lib/tramway/admin/notifications.rb
 - lib/tramway/admin/record_routes_helper.rb
 - lib/tramway/admin/records_models.rb
 - lib/tramway/admin/singleton_models.rb