cm-admin 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee189fda2ffbbbebebbf187b269408ae2b95a17e8373133fe5d0a8046abc4375
-  data.tar.gz: e6a788a92b95d4492dc86cbdcdc6abd518d3a361f802a88449ed923ebf02cc72
+  metadata.gz: bcbb26a08fa072ec95a1363e72c63ebfad6a1c661d303d50af5379f2f5bce0b1
+  data.tar.gz: 2f2526862a9312a48f768eb001ba52f6365182e105556136e2e763e96e21484a
 SHA512:
-  metadata.gz: 4eff826866357c66a2ff35980f3ef2a66576649b4c9285442f045986ee2a9435fb96dfa7f0761fe6b61df2f26941e62b13385d4aa6c7546808f5736d08437ae3
-  data.tar.gz: 281ba123d2514c2f51abe820f7f16eee2448b5efcea11ee06acee96b2ac3851663ff836a05cfe91b704f49e11f4c28c0e3490c1cf5ee4076cc68724b22b6c728
+  metadata.gz: c8d834bc6b9716aeef9b5c82137106c9aae52afd435ef384e7543be09fd4f18cb3f593374aebf5d840c9d17f7d0ecb99a9c9066508a1645fdff32d433d9ef983
+  data.tar.gz: c21ae398e2d2542186251a98bc706e203164e70319e841041527122358cd9cf3162620d8b860570b5f288f2ba1734c73a2a3a83da917c8b159120ad28c8febae

data/app/assets/stylesheets/cm_admin/scaffold.scss

@@ -12,3 +12,13 @@
   }
   
 }
+
+.nested-field-wrapper {
+  label {
+    font-size: 14px;
+    margin-bottom: 16px;
+  }
+  .nested-fields {
+    margin-bottom: 16px;
+  }
+}

data/app/views/cm_admin/main/_nested_fields.html.slim

@@ -1,7 +1,8 @@
 .nested-fields
   - @model.available_fields[action_name.to_sym][assoc_name].each do |field|
-    = f.label field.field_name, class: 'field-label'
-    br
-    = input_field_for_column(f, field)
-  - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-    = link_to_remove_association "remove #{assoc_name}", f
+    .row
+      .col-sm-10
+        = input_field_for_column(f, field)
+      .col-sm-2
+        - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+          = link_to_remove_association "x", f

data/app/views/cm_admin/main/_nested_table_form.html.slim

@@ -1,6 +1,7 @@
-#tasks
+.nested-field-wrapper
+  label.field-label = table_name.to_s.titleize
   = f.fields_for table_name do |record|
     = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: table_name }
   - if @reflections.select {|x| x if x.name == table_name}.first.macro == :has_many
     .links
-      = link_to_add_association "add #{table_name}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: table_name }}
+      = link_to_add_association "+ Add #{table_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: table_name }}

data/app/views/cm_admin/main/_top_navbar.html.slim

@@ -28,7 +28,7 @@
           = link_to custom_action.name.titleize, @model.ar_model.table_name + '/' + custom_action.path, class: 'primary-btn ml-2', method: custom_action.verb
         - elsif custom_action.display_type == :modal
           = link_to custom_action.name.titleize, '', class: 'primary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
-    - elsif @model.current_action.name == 'show'
+    - elsif @model.current_action.name == 'show' || @action.layout_type == "cm_association_show"
       - @model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
         - if custom_action.display_type == :button && custom_action.display_if.call(@ar_object)
           = link_to custom_action.name.titleize, custom_action.path.gsub(':id', params[:id]), class: 'primary-btn ml-2', method: custom_action.verb

data/lib/cm_admin/model.rb

@@ -99,6 +99,7 @@ module CmAdmin
             @model = CmAdmin::Model.find_by(name: controller_name.classify)
             @model.params = params
             @action = CmAdmin::Models::Action.find_by(@model, name: action_name)
+            @model.current_action = @action
             @ar_object = @model.try(@action.parent || action_name, params)
             @ar_object, @associated_model, @associated_ar_object = @model.custom_controller_action(action_name, params.permit!) if !@ar_object.present? && params[:id].present?
             aar_model = request.url.split('/')[-2].classify.constantize  if params[:aar_id]
@@ -134,11 +135,11 @@ module CmAdmin
                   data = @action.parent == "index" ? @ar_object.data : @ar_object
                   format.html { render action.partial }
                 else
-                  redirect_url = request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
                   if @action.code_block.call(@ar_object)
+                    redirect_url = @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
                     format.html { redirect_to redirect_url }
                   else
-                    format.html { redirect_to redirect_url }
+                    format.html { redirect_to request.referrer }
                   end
                 end
               elsif action.layout.present?

data/lib/cm_admin/models/action.rb

@@ -6,7 +6,7 @@ module CmAdmin
       include Actions::Blocks
       attr_accessor :name, :verb, :layout_type, :layout, :partial, :path, :page_title, :page_description,
         :child_records, :is_nested_field, :nested_table_name, :parent, :display_if, :route_type, :code_block,
-        :display_type, :action_type
+        :display_type, :action_type, :redirection_url
 
       def initialize(attributes = {}, &block)
         if attributes[:layout_type].present? && attributes[:layout].nil? && attributes[:partial].nil?

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This is an admin panel gem