tramway-admin 2.1.3.1 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeabc39d2bc0ce9ea3504bf578a0016a46e6278cbb27cdfbe8f393bf68f482fd
-  data.tar.gz: 6d65c6e3b06f0b6ef86a285a7dad3bbd713eaa7cecb72d0440be493f8381eb88
+  metadata.gz: 02b3fd52b732d4e15e693c4cc89aad5e2f631cdeadea0856eedcfdfefa0089c0
+  data.tar.gz: fdd63869e0e5a63280fce0902e80d23f2f77430c7c1de04d040cb8dba3e38c17
 SHA512:
-  metadata.gz: 900820722317c55bcc7cafb5a64632d75af778e91a6009b7edcc6dbf8a19ba6a6c5a21bbc18af6037f71e8a839d844fec7a244b4e0964758dea0b8f47cbdff98
-  data.tar.gz: 36830caf1c44bba27810e610cda58030470511dd2c8c854ff0e10ce7a9fc6d5b5aa47e4cc70686e6ced584743d934abda6cae0d3956e2d1f3f8f02226f858b6f
+  metadata.gz: ab4de60de6b8b1b52f515f234d58dc42d15ab56a6417dce6d25e21c3446d10b684faf34cab7a873d3c29470b5b77187723834e963a4d943b757839514dfdec00
+  data.tar.gz: '086e0b2ab7575f43e07b4a1925faf826a4d9014cbc2eb61cec7c3c275154f5fb29608ca77136b1f051be9ecee30169c7f99f4f8f9d8ec5dbc3576e15a6d25128'

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/_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/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '2.1.3.1'
+    VERSION = '3.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 2.1.3.1
+  version: 3.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-21 00:00:00.000000000 Z
+date: 2022-01-13 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.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Engine for admin