tramway-admin 2.1.3 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5070e71c71aebabe975e9a8a0c426b5ce209f0b23720a10d1fc789a11c6b83db
-  data.tar.gz: 7abb507822d7a1f4cb80593a40ef1a616a072fdc124142ef0e430391e3ec4477
+  metadata.gz: 9a386a68e9e5d73e44283c9afbc5607e23a6dc39c059510eb039e4480c059694
+  data.tar.gz: b8e50c30673e2ac8f4f4448a099a84334b2c8d6656a08cd8b8cc715ece2dfbeb
 SHA512:
-  metadata.gz: 36324047630459336866d9fd4bde04421d23307ef60c391c7467e894d3a7ac2bc3c8ab99e73f3ce664b248e767ddd5394cd54d2bb7752245f03aaf317967cef6
-  data.tar.gz: 46f856085c47f38907267eef00928b7473993de8cdf9b01cb75264be9e7e97b07223b6b75e9ae17e0e7c6d474a145f8be5e97fddb515332846cd9bd42c00eaba
+  metadata.gz: 0075433e4129c8f0369b243c1dc8be32b0f4a6cb7808551d3e134649b432ff4c1e64596caa7b943643dd08a6b10fd27dc2bd32607d0bed7045a18283abdaf9b6
+  data.tar.gz: a5a8a08c04c108544845ef70895c71027ecaff90a7b164192b1294d3f5b758144a25d3390983b542bffc6fc8854466127dd0b4539b5a157741bba060e89692e3

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

@@ -21,7 +21,7 @@ module Tramway
       protected
 
       def check_available!
-        raise 'Tramway::Admin - Model or Form is not available' if !model_given? && !form_given?
+        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
 
       def check_available_scope!
@@ -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/_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/_habtm_row.html.haml

@@ -5,7 +5,10 @@
       %hr
       - association_form = object.send("add_#{association.name}_form")
       = simple_form_for association_form, url: { controller: :has_and_belongs_to_many_records, action: :create, form: association_form.class, model_class: model_class, object_id: object.id }, method: :post do |f|
-        = f.association association_form.associations.first, label: false
-        = f.button :submit, "#{I18n.t('helpers.actions.add')} #{model_class.human_attribute_name(association.name).singularize.downcase}", class: 'btn-success'
+        - association_form.associations.each do |association_name|
+          - associations = association_form.model.class.reflect_on_all_associations.map(&:name)
+          - if associations.include? association_name
+            = f.association association_name, label: false
+            = f.button :submit, "#{I18n.t('helpers.actions.add')} #{model_class.human_attribute_name(association.name).singularize.downcase}", class: 'btn-success'
     %td{ colspan: 2 }
       = render 'tramway/admin/shared/show/associations/list', object: object, association: association

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

@@ -0,0 +1,21 @@
+- association_state_machines = object.send("#{association.name}_state_machines")
+%table.table.table-striped.table-bordered
+  - object.send(association.name)&.each do |association_object|
+    %tr{ id: "#{association.name}_#{association_object.id}" }
+      %td
+        = association_object.id
+      %td
+        = link_to association_object.name, record_path(association_object.id, model: association.options[:class_name])
+      %td
+        - association_state_machines.each do |state_method|
+          = 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'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '2.1.3'
+    VERSION = '3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: '3.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-12-19 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
@@ -278,6 +278,7 @@ files:
 - app/views/tramway/admin/shared/errors/server_error.html.haml
 - app/views/tramway/admin/shared/show/_attribute_tr.html.haml
 - app/views/tramway/admin/shared/show/associations/_habtm_row.html.haml
+- app/views/tramway/admin/shared/show/associations/_list.html.haml
 - app/views/tramway/admin/shared/show/associations/_row.html.haml
 - app/views/tramway/admin/shared/show/associations/_table_row.html.haml
 - app/views/tramway/admin/singletons/_form.html.haml
@@ -329,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Engine for admin