tramway-admin 2.1.3.2 → 3.0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80721c33dfdeba8fa169d9b695539daa6d60815a75108a1321c8942136e3a3ee
-  data.tar.gz: d4f17bcedd4cfe6113e6ef600d657a7f6761f38e6c9a766047c627aa6238f4ca
+  metadata.gz: aa0b55e83ec3fc784c9d7ca0590c557d62ad24fee0da6ecf86b16bf0358dff4a
+  data.tar.gz: d3aaf7cf6a93420787e891c683dfe34cfe40c11cb8acfb9b160e8efc89155672
 SHA512:
-  metadata.gz: f75e4b1819128e66cb47c93e103aabd9e829c1741004c79fdaf56db6f5bf0b959e63f7d93a665e854c82080047e40658dd5d2bc4474513f82d89eae2768b132e
-  data.tar.gz: 7a88d91517c5d3ee316b110ff4c14b82811cc68efaaaca61623f4008c51928bf96c7249048007c332b9a1ebd4764659ba821bc9e5e8fd7034e9cf5f1234a8b7c
+  metadata.gz: bb05dcd52a0f0597a8e8c29b4e53f0c0cc11e15ab3112888e23f3cf487738817c3984e51092009dfb86ad56bf006dabdabae48e964c766229b5c2ab644dfdc76
+  data.tar.gz: 84a270fb558d455bb82238b3ef735e879b3e1ebe655f92b4ef033c467e290a59aa8dfabee5524bd682d00c051fcaa3bf334d613da2b813359f73b0fe450b77db

data/README.md

@@ -192,6 +192,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 +202,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 +215,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 +486,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
 ```
 
@@ -541,7 +562,8 @@ class YourModelDecorator < Tramway::Core::ApplicationDecorator
           inner: lambda do # inner HTML you want to see in the button
             fa_icon 'file-excel'
           end,
-          color: :success # bootstrap button color
+          color: :success, # bootstrap button color
+          method: :get # HTTP method. get method is a default. Available: :post, :patch: delete
         }
       ]
     }

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/tramway/admin/records/_list.html.haml

@@ -20,7 +20,7 @@
         %td.actions
           .row
                
-            = link_to fa_icon('pencil-alt'), edit_current_model_record_path(record.id), class: 'btn btn-warning btn-xs'
+            = 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'

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

@@ -8,7 +8,7 @@
         = 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])
-        - decorator_class(model_class).list_filters.each_slice(3) do |slice|
+        - decorator_class(model_class).list_filters&.each_slice(3) do |slice|
           .row-fluid.filters
             - slice.each do |filter|
               - case filter[1][:type]

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

@@ -4,17 +4,19 @@
       = association_object.id
     %td
       = link_to association_object.name, record_path(association_object.id, model: association.options[:class_name])
+    - 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
-      - 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 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
-          = 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
-          = fa_icon 'trash-alt'
-      - if habtm_destroy_is_available? association_object, object
-        = delete_button url: has_and_belongs_to_many_record_path(association_object.id, model_class: object.model.class, object_id: object.id, form: "Admin::#{object.model.class.to_s.pluralize}::Remove#{association_object.model.class.to_s}Form", redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-danger delete' } do
-          = fa_icon 'trash-alt'
+      .row{ style: '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', 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
+            = fa_icon 'trash-alt'
+        - if habtm_destroy_is_available? association_object, object
+          = delete_button url: has_and_belongs_to_many_record_path(association_object.id, model_class: object.model.class, object_id: object.id, form: "Admin::#{object.model.class.to_s.pluralize}::Remove#{association_object.model.class.to_s}Form", redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-danger delete' } do
+            = fa_icon 'trash-alt'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '2.1.3.2'
+    VERSION = '3.0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 2.1.3.2
+  version: 3.0.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2022-01-25 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
@@ -305,7 +305,6 @@ files:
 - lib/tramway/admin/generators/templates/form.rb.erb
 - lib/tramway/admin/navbar.rb
 - lib/tramway/admin/notifications.rb
-- lib/tramway/admin/preview.rb
 - lib/tramway/admin/record_routes_helper.rb
 - lib/tramway/admin/records_models.rb
 - lib/tramway/admin/singleton_models.rb
@@ -331,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Engine for admin

data/lib/tramway/admin/preview.rb

@@ -1,15 +0,0 @@
-module Tramway::Admin::Preview
-  def set_previewable_models(*models)
-    @previewable_models ||= []
-    @previewable_models += models.map(&:to_s)
-  end
-
-  def previewable_models
-    @previewable_models
-  end
-
-  def is_available_to_preview?(model_class)
-    @previewable_models ||= []
-    @previewable_models.include? model_class.to_s
-  end
-end