tramway-admin 1.26.1.1 → 1.26.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 261075e424f3e32ae7e9fdcd8dee49effe2bceb4a180ca07276f238a9407df91
-  data.tar.gz: a8dd65b6dee78514b51f9d2abbfd4243ef0097c928080abe7ca78a10edefb81e
+  metadata.gz: 7e74929c977533c46f0275270e00650c217553b733cc05f1fc42efb032a78e58
+  data.tar.gz: 1585d1a11659364ac3754bd30ac54fc98b81b1ac97dbf196c22a56e51337b1b6
 SHA512:
-  metadata.gz: 84bd41cc6f2945dcc5e1df3f27ed2c8ab0696cfe16816d168b5797d975ee7e75f72d2fb88ebd7d7289952d0a7692c143981a8349efbb676206b996fb4483513c
-  data.tar.gz: 1297688f9d6bfc72fff4cf04896de67ca411c1e1408bc2b4afe6fb6636313a5cef2a1d792c1bdc62a51999c457053e6b10963586dd45e97fd222f3d658a6fcab
+  metadata.gz: a3ae80b23d1c8876b1ad29633a3dc850e5b9acd4382895bbb760356ae99fea480fcd9205bd863423f21fd1d95540f3e61d47468113d6bd5ff58e0ee714300dbf
+  data.tar.gz: 1e2c46b96d3694ebcd5a667052929c2941cc2e1a409301fb637671406127f4299bbd3558d8d484afa82836a4ede2edab7181edf26f249b81ea040d64aad9be30

data/README.md

@@ -12,6 +12,8 @@ Short description and motivation.
 ## Usage
 How to use my plugin.
 
+#### 1. Add this gems to Gemfile
+
 *Gemfile*
 ```ruby
 gem 'tramway-admin'
@@ -24,7 +26,7 @@ gem 'haml-rails'
 gem 'selectize-rails'
 gem 'bootstrap'
 gem 'jquery-rails'
-gem 'copyright-mafa'
+gem 'copyright_mafa'
 gem 'trap'
 gem 'kaminari'
 gem 'bootstrap-kaminari-views', github: 'kalashnikovisme/bootstrap-kaminari-views', branch: :master
@@ -34,7 +36,9 @@ gem 'ransack'
 gem 'smart_buttons'
 ```
 
-You should remove gem `turbolinks` from your application
+#### 2. You should remove gem `turbolinks` from your application and from app/assets/javascripts/application.js
+
+#### 3. Update your routes
 
 *config/routes.rb*
 
@@ -45,26 +49,33 @@ Rails.application.routes.draw do
 end
 ```
 
-Then make `tramway-core` installation. [How-to](https://github.com/ulmic/tramway-dev/blob/develop/tramway-core/README.md#installation)
+#### 4. Then make `tramway-core` installation. [How-to](https://github.com/ulmic/tramway-dev/blob/develop/tramway-core/README.md#installation)
+
 
+#### 5. And then execute:
 
-And then execute:
 ```bash
 $ bundle
 $ rails g tramway:user:install
 $ rails db:migrate
+```
 
-# Creating your first admin user
+#### 6. Create your first admin user
 
+```bash
 $ rails c
 $> Tramway::User::User.create! email: 'your@email.com', password: '123456789', role: :admin
 ```
 
+#### 7. Add models to your admin
+
 *app/config/initializers/tramway.rb*
 
 ```ruby
 # set available models for your admin
-::Tramway::Admin.set_available_models list_of_models, project: #{project_name_which_you_used_in_application_name}
+::Tramway::Admin.set_available_models YourModel, AnotherYourModel, project: #{project_name_which_you_used_in_application_name}
+# set singleton models for your admin
+::Tramway::Admin.set_singleton_models YourSingletonModel, AnotherYourSingletonModel, project: #{project_name_which_you_used_in_application_name}
 ::Tramway::Auth.root_path = '/admin' # you need it to redirect in the admin panel after admin signed_in
 ```
 
@@ -100,8 +111,8 @@ You can set conditions for functions which are available for any role:
 
 Here docs about changing roles of `Tramway::User::User` model [Readme](https://github.com/ulmic/tramway-dev/tree/develop/tramway#if-you-want-to-edit-roles-to-the-tramwayuseruser-class)
 
-Run server `rails s`
-Launch `localhost:3000/admin`
+#### 8. Run server `rails s`
+#### 9. Launch `localhost:3000/admin`
 
 ## Date Picker locale
 

data/app/assets/javascripts/tramway/admin/application.js

@@ -0,0 +1,8 @@
+//= require tramway/core/application
+//= require jquery
+//= require jquery_ujs
+//= require popper
+//= require bootstrap-sprockets
+//= require ckeditor/init
+//= require selectize
+//= require_tree .

data/app/assets/javascripts/tramway/admin/focus.js

@@ -0,0 +1,7 @@
+$(document).ready(function() {
+  const url = new URL(window.location.href);
+  const focusElementSelector = url.searchParams.get('focus');
+  if (!$(focusElementSelector).offset() == undefined) {
+    $(window).scrollTop($(focusElementSelector).offset().top);
+  }
+});

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

@@ -51,7 +51,7 @@ module Tramway
       end
 
       def notifications_count
-        @notifications_count = notifications.reduce(0) do |count, notification|
+        @notifications_count = notifications&.reduce(0) do |count, notification|
           count += notification[1].count
         end
       end

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

@@ -32,22 +32,23 @@
 
       %ul.nav.navbar-nav.ml-auto
         - if signed_in?
-          - if @notifications_count > 0
-            %li.nav-item.dropdown.notifications
-              = link_to '#', class: 'nav-link icon-in-navbar dropdown-toggle', id: :notifications_dropdown, role: :button, aria: { haspopup: true, expanded: false }, data: { toggle: :dropdown } do
-                %span.badge.badge-light
-                  = @notifications_count
-              .dropdown-menu.dropdown-menu-right{ aria: { labelledby: :notifications_dropdown } }
-                - @notifications.each_with_index do |collection, index|
-                  - collection[1].each do |item|
-                    = link_to decorator_class(item.class).decorate(item).title, record_path(item, model: item.class), class: 'dropdown-item'
-                  - if index < @notifications.count - 1
-                    .dropdown-divider
-          - else
-            %li.nav-item.notifications
-              = link_to '#', class: 'nav-link icon-in-navbar' do
-                %span.badge.badge-light
-                  = @notifications_count
+          - if @notifications_count.present?
+            - if @notifications_count > 0
+              %li.nav-item.dropdown.notifications
+                = link_to '#', class: 'nav-link icon-in-navbar dropdown-toggle', id: :notifications_dropdown, role: :button, aria: { haspopup: true, expanded: false }, data: { toggle: :dropdown } do
+                  %span.badge.badge-light
+                    = @notifications_count
+                .dropdown-menu.dropdown-menu-right{ aria: { labelledby: :notifications_dropdown } }
+                  - @notifications.each_with_index do |collection, index|
+                    - collection[1].each do |item|
+                      = link_to decorator_class(item.class).decorate(item).title, record_path(item, model: item.class), class: 'dropdown-item'
+                    - if index < @notifications.count - 1
+                      .dropdown-divider
+            - else
+              %li.nav-item.notifications
+                = link_to '#', class: 'nav-link icon-in-navbar' do
+                  %span.badge.badge-light
+                    = @notifications_count
           %li.nav-item
             = link_to Tramway::Auth::Engine.routes.url_helpers.session_path, method: :delete, class: 'nav-link' do
               = fa_icon 'sign-out-alt'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.26.1.1'
+    VERSION = '1.26.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.26.1.1
+  version: 1.26.1.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
@@ -28,20 +28,20 @@ dependencies:
   name: copyright_mafa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
@@ -68,20 +68,20 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
@@ -177,8 +177,8 @@ files:
 - app/assets/javascripts/ckeditor/plugins/youtube/lang/en.js
 - app/assets/javascripts/ckeditor/plugins/youtube/lang/ru.js
 - app/assets/javascripts/ckeditor/plugins/youtube/plugin.js
-- app/assets/javascripts/tramway/admin/application.js.coffee
-- app/assets/javascripts/tramway/admin/focus.js.coffee
+- app/assets/javascripts/tramway/admin/application.js
+- app/assets/javascripts/tramway/admin/focus.js
 - app/assets/stylesheets/tramway/admin/application.sass
 - app/controllers/tramway/admin/application_controller.rb
 - app/controllers/tramway/admin/records_controller.rb
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Engine for admin

data/app/assets/javascripts/tramway/admin/application.js.coffee

@@ -1,8 +0,0 @@
-#= require tramway/core/application
-#= require jquery
-#= require jquery_ujs
-#= require popper
-#= require bootstrap-sprockets
-#= require ckeditor/init
-#= require selectize
-#= require_tree .

data/app/assets/javascripts/tramway/admin/focus.js.coffee

@@ -1,5 +0,0 @@
-$ ->
-  url = new URL(window.location.href)
-  focusElementSelector = url.searchParams.get('focus')
-  unless $(focusElementSelector).offset() == undefined
-    $(window).scrollTop $(focusElementSelector).offset().top