tramway-admin 2.1.3.3 → 4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcf7895786074971f30f08a973c8bc290a533faff676f5ecc65c444076d7f397
-  data.tar.gz: 0d445fbf425502399899e0d66be21acb78ee0f673ec06abb94d7f2743a29e239
+  metadata.gz: 0da53840f67044b77ccf8d8c37b2dd02d23fde702aa09550182062056032fc5f
+  data.tar.gz: 50ae25d697d79b09e8aeb59b19d35a6be14b3b904dfaf0a47562cf5bc3e28401
 SHA512:
-  metadata.gz: 9d2619f6ab1f3eef6bc2a330f0dd17f91272fad60c478a07329892fd986bcd13c38bfd5312c69576df533946fca4f20219857ac34a68e8b87aa72e8bebb989f4
-  data.tar.gz: b1bb886e6bb88028d7665b545c3b8c1550398e19c585cda994e7863a10eeb45dff197837b2a2b5137a5189c47c60103e063695918880adaad097766f1cf8d48d
+  metadata.gz: f7f23e28049699b42619820d7c643dcaff51983aa3430da9b5b77d8424e484531fd19f09ba4b07e540ed416c0d3eeb0a12b8551c001fc437634110e0247b0432
+  data.tar.gz: af55df2f1614906fd42ca0313e1acf463b08aa78dcb71f4ca1cca50aafe0de8f0f1af20995ea91910b3016d9e062bbdc06bc4dffa8e7f2d09062784a5e360f43

data/README.md

@@ -48,7 +48,6 @@ end
 #### 5. And then execute:
 
 ```bash
-$ bundle
 $ rails g tramway:user:install
 $ rails db:migrate
 ```
@@ -192,6 +191,9 @@ en:
 class Admin::YourModelForm < Tramway::Core::ApplicationForm
   properties :title, :description, :text, :date, :logo
 
+  association :associated
+  association :another_polymorphic_associated
+
   def initialize(object)
     super(object).tap do
       form_properties title: :string,
@@ -199,6 +201,8 @@ class Admin::YourModelForm < Tramway::Core::ApplicationForm
         description: :ckeditor,
         date: :date_picker,
         text: :text,
+        associated: :association,
+        another_polymorphic_association: :polymorphic_association,
         birth_date: {
           type: :default,
           input_options: {
@@ -210,6 +214,22 @@ class Admin::YourModelForm < Tramway::Core::ApplicationForm
 end
 ```
 
+**NOTE**
+If you want fill inputs of this form, just send query params
+
+```
+params = {
+  your_model: {
+    logo: '/file/url',
+    description: 'some text',
+    text: 'some another text',
+    associated_id: 5,
+    another_polymorphic_associated: 56,
+    another_polymorphic_associated_type: 'AnotherModel'
+  }
+}
+```
+
 #### 10. Add inheritance to YourModel
 
 *app/models/your_model.rb*
@@ -465,7 +485,7 @@ To add notification to application, you need just set queries in initializers.
 # Example from tramway-event gem (you also can push context variables here)
 
 ::Tramway::Admin.set_notificable_queries new_participants: -> (current_user) do
-  ::Tramway::Event::Participant.active.where(participation_state: :requested).send "#{current_user}_scope", current_user.id
+  ::Tramway::Event::Participant.where(participation_state: :requested).send "#{current_user}_scope", current_user.id
 end
 ```
 

data/app/assets/stylesheets/tramway/admin/application.sass

@@ -11,8 +11,9 @@
 .container
   padding-top: 2rem
 
-td.actions
-  width: 8rem
+td
+  &.actions
+    width: 8rem
 
 .icon-in-navbar
   font-size: 15pt

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

@@ -30,7 +30,7 @@ module Tramway
 
       def collections_counts
         @counts = decorator_class.collections.reduce({}) do |hash, collection|
-          records = model_class.active.send(collection)
+          records = model_class.send(collection)
           records = records.send "#{current_admin.role}_scope", current_admin.id
           records = records.ransack(params[:filter]).result if params[:filter].present?
           params[:list_filters]&.each do |filter, value|

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

@@ -3,7 +3,7 @@
 class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationController
   def index
     scope = params[:scope].present? ? params[:scope] : :all
-    records = model_class.active.order(id: :desc).send scope
+    records = model_class.order(id: :desc).send scope
     records = records.full_text_search params[:search] if params[:search].present?
     if params[:filter].present?
       if params[:filter].is_a? String
@@ -30,7 +30,7 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
   end
 
   def show
-    @record = decorator_class.decorate model_class.active.find params[:id]
+    @record = decorator_class.decorate model_class.find params[:id]
   end
 
   def new
@@ -47,11 +47,11 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
   end
 
   def edit
-    @record_form = admin_form_class.new model_class.active.find params[:id]
+    @record_form = admin_form_class.new model_class.find params[:id]
   end
 
   def update
-    @record_form = admin_form_class.new model_class.active.find params[:id]
+    @record_form = admin_form_class.new model_class.find params[:id]
     if params[:record][:aasm_event].present?
       if @record_form.model.send("may_#{params[:record][:aasm_event]}?")
         @record_form.model.send("#{params[:record][:aasm_event]}!")
@@ -67,8 +67,8 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
   end
 
   def destroy
-    record = model_class.active.find params[:id]
-    record.remove!
+    record = model_class.find params[:id]
+    record.destroy
     redirect_to params[:redirect].present? ? params[:redirect] : records_path
   end
 end

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

@@ -10,7 +10,7 @@ class Tramway::Admin::SessionsController < ::Tramway::Admin::ApplicationControll
   end
 
   def create
-    @session_form = ::Tramway::Auth::SessionForm.new ::Tramway::User::User.active.find_or_initialize_by email: params[:user][:email]
+    @session_form = ::Tramway::Auth::SessionForm.new ::Tramway::User::User.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/controllers/tramway/admin/singletons_controller.rb

@@ -3,8 +3,8 @@
 module Tramway::Admin
   class SingletonsController < ApplicationController
     def show
-      if model_class.active.first.present?
-        @singleton = decorator_class.decorate model_class.active.first
+      if model_class.first.present?
+        @singleton = decorator_class.decorate model_class.first
       else
         @singleton_form = admin_form_class.new model_class.new
         render :new
@@ -13,7 +13,7 @@ module Tramway::Admin
     end
 
     def edit
-      @singleton_form = admin_form_class.new model_class.active.first
+      @singleton_form = admin_form_class.new model_class.first
     end
 
     def create
@@ -26,7 +26,7 @@ module Tramway::Admin
     end
 
     def update
-      @singleton_form = admin_form_class.new model_class.active.first
+      @singleton_form = admin_form_class.new model_class.first
       if @singleton_form.submit params[:singleton]
         redirect_to params[:redirect] || singleton_path(model: params[:model])
       else

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

@@ -3,34 +3,35 @@
   - if ::Tramway::Admin.customized_admin_navbar.present?
     = ::Tramway::Admin.customized_admin_navbar
   - else
-    = link_to @application&.try(:title) || @application&.public_name || t('aplication.title'), ::Tramway::Admin::Engine.routes.url_helpers.root_path, class: 'navbar-brand'
-    %button.navbar-toggler.collapsed{ aria: { controls: :navbar, expanded: "false", label: 'Toggle Navigation' }, data: { target: "#navbar", toggle: :collapse }, type: :button }
-      %span.navbar-toggler-icon
-    .navbar-collapse.collapse#navbar
-      - if current_admin
-        %ul.navbar-nav
-          - ::Tramway::Admin.navbar_items_for(@application_engine || @application.name, role: current_admin.role)&.each do |item|
-            - case item.keys.first
-            - when Class, String
-              - model = item.keys.first.is_a?(String) ? item.keys.first.constantize : item.keys.first
-              - case item.values.first
-              - when :singleton
-                = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
-              - when :record
-                = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.model_name).capitalize
-            - when Symbol, String
-              = dropdown t("admin.navbar.links.#{item.keys.first}") do
-                - item.values.first.each do |sub_item|
-                  - if sub_item == :divider
-                    = dropdown_divider
-                  - else
-                    - model = sub_item.keys.first
-                    - if sub_item.values.first == :singleton
-                      = dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
-                    - if sub_item.values.first == :record
-                      = dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.constantize.model_name).capitalize
+    .container-fluid
+      = link_to @application&.try(:title) || @application&.public_name || t('aplication.title'), ::Tramway::Admin::Engine.routes.url_helpers.root_path, class: 'navbar-brand'
+      %button.navbar-toggler.collapsed{ aria: { controls: :navbar, expanded: "false", label: 'Toggle Navigation' }, data: { target: "#navbar", toggle: :collapse }, type: :button }
+        %span.navbar-toggler-icon
+      .navbar-collapse.collapse#navbar
+        - if current_admin
+          %ul.navbar-nav
+            - ::Tramway::Admin.navbar_items_for(@application_engine || @application.name, role: current_admin.role)&.each do |item|
+              - case item.keys.first
+              - when Class, String
+                - model = item.keys.first.is_a?(String) ? item.keys.first.constantize : item.keys.first
+                - case item.values.first
+                - when :singleton
+                  = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
+                - when :record
+                  = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.model_name).capitalize
+              - when Symbol, String
+                = dropdown t("admin.navbar.links.#{item.keys.first}") do
+                  - item.values.first.each do |sub_item|
+                    - if sub_item == :divider
+                      = dropdown_divider
+                    - else
+                      - model = sub_item.keys.first
+                      - if sub_item.values.first == :singleton
+                        = dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
+                      - if sub_item.values.first == :record
+                        = dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.constantize.model_name).capitalize
 
-      %ul.nav.navbar-nav.ml-auto
+      %ul.nav.navbar-nav.ml-auto.justify-content-end
         - if current_admin
           %li.nav-item
             %span.nav-link

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

@@ -12,7 +12,7 @@
       - @record_form.properties.each do |property, type|
         = render 'tramway/core/shared/input', property: property, object: :record, type: type, form: f, destination: :admin, value: value_from_params(model_class: model_class, property: property, type: type)
       = hidden_field_tag :redirect, params[:redirect]
-      = f.button :submit, t('helpers.links.save'), class: 'btn-success'
+      = f.button :submit, t('helpers.links.save'), class: 'btn btn-success'
       = link_to t('helpers.links.back'), current_model_records_path, class: 'btn btn-secondary'
 
 -# NOTES

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

@@ -1,29 +1,30 @@
 = paginate @records, theme: 'twitter-bootstrap-4'
-%table.table.table-striped.table-bordered
+%table.table.table-striped.table-hover
   %thead
     %tr
-      %th= model_class.human_attribute_name(:id)
-      %th= model_class.human_attribute_name(:name)
+      %th{ scope: :col }
+        = model_class.human_attribute_name(:id)
+      %th{ scope: :col }
+        = model_class.human_attribute_name(:name)
       - decorator_class.list_attributes.each do |attribute|
-        %th= model_class.human_attribute_name attribute
-      %th= t 'helpers.links.actions'
+        %th{ scope: :col }
+          = model_class.human_attribute_name attribute
+      %th{ scope: :col }
+        = t 'helpers.links.actions'
   %tbody
     - @records.each_with_index do |record, index|
       %tr
-        %td
+        %th{ scope: :row }
           = link_to record.id, current_model_record_path(record.id)
-        %td
+        %td.link{ data: { href: current_model_record_path(record.id) } }
           = link_to record.name, current_model_record_path(record.id)
         - decorator_class.list_attributes.each do |attribute|
           %td
             = record.send attribute
         %td.actions
-          .row
-               
-            = link_to fa_icon('pencil-alt'), edit_current_model_record_path(record.id), class: 'btn btn-warning btn-xs'
-              
-            = delete_button url: current_model_record_path(record.id), form_options: { class: :smart_button }, button_options: { class: 'btn btn-xs btn-danger' } do
-              = fa_icon 'trash-alt'
+          = link_to fa_icon('pencil-alt'), edit_current_model_record_path(record.id, redirect: current_model_records_path(record.id)), class: 'btn btn-warning btn-xs'
+          = delete_button url: current_model_record_path(record.id), form_options: { class: :smart_button }, button_options: { class: 'btn btn-xs btn-danger' } do
+            = fa_icon 'trash-alt'
           - if tramway_model?(model_class)
             %br
             %br

data/app/views/tramway/admin/shared/show/associations/_table_row.html.haml

@@ -4,13 +4,14 @@
       = association_object.id
     %td
       = link_to association_object.name, record_path(association_object.id, model: association.options[:class_name])
-    %td
-      - association_object.model.class.state_machines_names.each do |state_method|
-        - unless state_method == 'default'
-          = state_events_buttons association_object, state_method: state_method, model_param_name: :record, controller: 'tramway/admin/records', action: :update, parameters: { redirect: current_model_record_path(object.id), model: association_object.class.model_name }, button_options: { class: :smart_button }
-    %td
+    - if association_object.model.class.state_machines_names.count > 1
+      %td
+        - association_object.model.class.state_machines_names.each do |state_method|
+          - unless state_method == 'default'
+            = state_events_buttons association_object, state_method: state_method, model_param_name: :record, controller: 'tramway/admin/records', action: :update, parameters: { redirect: current_model_record_path(object.id), model: association_object.class.model_name }, button_options: { class: :smart_button }
+    %td{ style: 'display: flex; justify-content: space-evenly' }
       - if update_is_available? association_object, object
-        = edit_button url: edit_record_path(association_object.id, model: association.options[:class_name], redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-warning edit' } do
+        = edit_button url: edit_record_path(association_object.id, model: association.options[:class_name], redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-warning edit', style: 'height: max-content' } do
           = fa_icon 'pencil-alt'
       - if destroy_is_available? association_object, object
         = delete_button url: record_path(association_object.id, model: association.options[:class_name], redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-danger delete' } do

data/app/views/tramway/admin/singletons/_form.html.haml

@@ -11,5 +11,5 @@
     = simple_form_for @singleton_form.model, url: { controller: :singletons, action: action, model: @singleton_form.model.class }, input_html: { class: 'form-horizontal' } do |f|
       - @singleton_form.properties.each do |property, type|
         = render 'tramway/core/shared/input', property: property, object: :singleton, type: type, form: f, destination: :admin, value: value_from_params(model_class: model_class, property: property, type: type)
-      = f.button :submit, t('helpers.links.save'), class: 'btn-success'
+      = f.button :submit, t('helpers.links.save'), class: 'btn btn-success'
       = link_to t('helpers.links.back'), singleton_path, class: 'btn btn-secondary'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '2.1.3.3'
+    VERSION = '4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 2.1.3.3
+  version: '4.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core
@@ -70,20 +70,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
@@ -330,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Engine for admin