cm-admin 0.7.4 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 810496f7dd375b4849ce820652272c6d36dec1767807beab966e4abc1a00a922
-  data.tar.gz: 522f04bc7abeddf95dceebfe980c3b7d955b3d3907de9060af5923803622ed59
+  metadata.gz: fc4dad533a8a02bcc62cc27dd83d829b07794c32a2849e2eebc21de1c1f6cc84
+  data.tar.gz: 30b772fbd67cf68633111b3290685e8d3d9d03c269d93313ab915d490c458311
 SHA512:
-  metadata.gz: fc0a6ebd3f81ee0c8df337d630c71cff47d49bb7e422e1d39f9f5f1663c21e7714bd740cf8b1a37d37cbbc3827d18ccc58822031794a228696043633886466ec
-  data.tar.gz: 6a13e1994ea27658ac281f88970b1d5b471ee52982be02af9e8ce55dd1b9f6706085543a3f0cbddced246371254b8143243ed6e2756e413d6302fde891718c9d
+  metadata.gz: 31ec145cf1c7bb3c60a878b733fd251169d5403b6501f421180880ef56c7857f37e5d303ed4b93bd56a6ebfa4b7642f526db533864156a6e5a4e50af19b69d8a
+  data.tar.gz: c45f05a62af30393e5d8bb458374afc51695c311310d6b3d497d6326913cbc45de634385d57a757e91748033de2765e321619c2ed64d1807ec612b763b98a8c1

data/Gemfile.lock

@@ -1,31 +1,32 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.7.3)
+    cm-admin (0.7.7)
       axlsx_rails (~> 0.6.1)
       cocoon (~> 1.2.15)
+      local_time (~> 2.1.0)
       pagy (~> 4.11.0)
       pundit (~> 2.2.0)
       slim (~> 4.1.0)
-      webpacker (~> 5.2.1)
+      webpacker (~> 5.4.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.2.3)
-      actionview (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionpack (7.0.3.1)
+      actionview (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionview (7.0.3.1)
+      activesupport (= 7.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.2.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -40,38 +41,39 @@ GEM
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
     cocoon (1.2.15)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.4.4)
     erubi (1.10.0)
     htmlentities (4.3.4)
-    i18n (1.10.0)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.17.0)
+    local_time (2.1.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     marcel (1.0.2)
     method_source (1.0.0)
-    minitest (5.15.0)
-    nokogiri (1.13.5-arm64-darwin)
+    minitest (5.16.2)
+    nokogiri (1.13.7-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.4)
     rack-proxy (0.7.2)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    railties (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -100,12 +102,12 @@ GEM
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    webpacker (5.2.2)
+    webpacker (5.4.3)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -30,7 +30,7 @@ You can find more detailed documentation [here](https://github.com/commutatus/cm
 
 ## Demo
 
-For demo check [here](http://cm-admin.labs.commutatus.com/admin/users/)
+For demo check [here](http://cm-admin.labs.commutatus.com)
 For demo repo check [here](https://github.com/commutatus/cm-admin-panel-demo)
 
 ## Development

data/app/controllers/cm_admin/application_controller.rb

@@ -1,9 +1,8 @@
 module CmAdmin
   class ApplicationController < ::ActionController::Base
-    include Pundit::Authorization
+    
     # before_action :check_cm_admin
     layout 'cm_admin'
-    helper CmAdmin::ViewHelpers
 
 
     def check_cm_admin

data/app/controllers/cm_admin/resource_controller.rb

@@ -0,0 +1,194 @@
+module CmAdmin
+  class ResourceController < ApplicationController
+    include Pundit::Authorization
+    include Pagy::Backend
+
+    helper CmAdmin::ViewHelpers
+
+    def cm_index(params)
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: 'index')
+      # Based on the params the filter and pagination object to be set
+      @ar_object = filter_by(params, nil, @model.filter_params(params))
+      # resource_identifier
+      respond_to do |format|
+        if request.xhr?
+          format.html { render partial: '/cm_admin/main/table' }
+        else
+          format.html { render '/cm_admin/main/' + action_name }
+        end
+      end
+    end
+
+    def cm_show(params)
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: 'show')
+      scoped_model = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+      @ar_object = scoped_model.find(params[:id])
+      resource_identifier
+      respond_to do |format|
+        format.html { render '/cm_admin/main/' + action_name }
+      end
+    end
+
+    def cm_new(params)
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: 'new')
+      @ar_object = @model.ar_model.new
+      resource_identifier
+      respond_to do |format|
+        format.html { render '/cm_admin/main/' + action_name }
+      end
+    end
+
+    def cm_edit(params)
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: 'edit')
+      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      resource_identifier
+      respond_to do |format|
+        format.html { render '/cm_admin/main/' + action_name }
+      end
+    end
+
+    def cm_update(params)
+      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object.assign_attributes(resource_params(params))
+      resource_identifier
+      resource_responder
+    end
+
+    def cm_create(params)
+      @ar_object = @model.ar_model.name.classify.constantize.new(resource_params(params))
+      resource_identifier
+      resource_responder
+    end
+
+    def cm_destroy(params)
+      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      respond_to do |format|
+        if @ar_object.destroy
+          format.html { redirect_back fallback_location: cm_admin.send("#{@model.name.underscore}_index_path"), notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
+        else
+          format.html { redirect_back fallback_location: cm_admin.send("#{@model.name.underscore}_index_path"), notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is unsuccessful" }
+        end
+      end
+    end
+
+    def cm_custom_method(params)
+      scoped_model = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+      resource_identifier
+      respond_to do |format|
+        if @action.action_type == :custom
+          if @action.child_records
+            format.html { render @action.layout }
+          elsif @action.display_type == :page
+            data = @action.parent == "index" ? @ar_object.data : @ar_object
+            format.html { render @action.partial }
+          else
+            ar_object = @action.code_block.call(@ar_object)
+            if ar_object.errors.empty?
+              redirect_url = @model.current_action.redirection_url || @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
+              format.html { redirect_to redirect_url, notice: "#{@action.name.titleize} is successful" }
+            else
+              error_messages = ar_object.errors.full_messages.map{|error_message| "<li>#{error_message}</li>"}.join
+              format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
+            end
+          end
+        end
+      end
+    end
+
+    def resource_identifier
+      @ar_object, @associated_model, @associated_ar_object = custom_controller_action(action_name, params.permit!) if !@ar_object.present? && params[:id].present?
+      authorize controller_name.classify.constantize, policy_class: "CmAdmin::#{controller_name.classify}Policy".constantize if defined? "CmAdmin::#{controller_name.classify}Policy".constantize
+      aar_model = request.url.split('/')[-2].classify.constantize  if params[:aar_id]
+      @associated_ar_object = aar_model.find(params[:aar_id]) if params[:aar_id]
+      nested_tables = @model.available_fields[:new].except(:fields).keys
+      nested_tables += @model.available_fields[:edit].except(:fields).keys
+      @reflections = @model.ar_model.reflect_on_all_associations
+      nested_tables.each do |table_name|
+        reflection = @reflections.select {|x| x if x.name == table_name}.first
+        if reflection.macro == :has_many
+          @ar_object.send(table_name).build if action_name == "new" || action_name == "edit"
+        elsif action_name == "new"
+          @ar_object.send(('build_' + table_name.to_s).to_sym)
+        end
+      end
+    end
+
+    def resource_responder
+      respond_to do |format|
+        if params["referrer"]
+          redirect_url = params["referrer"]
+        else
+          redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}/#{@ar_object.id}"
+        end
+        if @ar_object.save
+          format.html { redirect_to  redirect_url, notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
+        else
+          format.html { render '/cm_admin/main/new', notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is unsuccessful" }
+        end
+      end
+    end
+
+    def custom_controller_action(action_name, params)
+      current_action = CmAdmin::Models::Action.find_by(@model, name: action_name.to_s)
+      if current_action
+        @current_action = current_action
+        @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+        if @current_action.child_records
+          child_records = @ar_object.send(@current_action.child_records)
+          @associated_model = CmAdmin::Model.find_by(name: @model.ar_model.reflect_on_association(@current_action.child_records).klass.name)
+          if child_records.is_a? ActiveRecord::Relation
+            @associated_ar_object = filter_by(params, child_records)
+          else
+            @associated_ar_object = child_records
+          end
+          return @ar_object, @associated_model, @associated_ar_object
+        end
+        return @ar_object
+      end
+    end
+
+    def filter_by(params, records, filter_params={}, sort_params={})
+      filtered_result = OpenStruct.new
+      sort_column = "created_at"
+      sort_direction = %w[asc desc].include?(sort_params[:sort_direction]) ? sort_params[:sort_direction] : "asc"
+      sort_params = {sort_column: sort_column, sort_direction: sort_direction}
+      
+      records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve if records.nil?
+      records = records.order("#{@current_action.sort_column} #{@current_action.sort_direction}")
+
+      final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, @model.filters)
+      pagy, records = pagy(final_data)
+      filtered_result.data = records
+      filtered_result.pagy = pagy
+      # filtered_result.facets = paginate(page, raw_data.size)
+      # filtered_result.sort = sort_params
+      # filtered_result.facets.sort = sort_params
+      return filtered_result
+    end
+
+    def resource_params(params)
+      permittable_fields = @permitted_fields || @model.ar_model.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym)
+      permittable_fields += @model.ar_model.name.constantize.reflect_on_all_associations.map {|x|
+        next if x.options[:polymorphic]
+        if x.class.name.include?('HasOne')
+          x.name.to_s.gsub('_attachment', '').gsub('rich_text_', '').to_sym
+        elsif x.class.name.include?('HasMany')
+          Hash[x.name.to_s.gsub('_attachment', ''), []]
+        end
+      }.compact
+      nested_tables = @model.available_fields[:new].except(:fields).keys
+      nested_tables += @model.available_fields[:edit].except(:fields).keys
+      nested_fields = nested_tables.uniq.map {|table|
+        Hash[
+          table.to_s + '_attributes',
+          table.to_s.classify.constantize.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym) + [:id, :_destroy]
+        ]
+      }
+      permittable_fields += nested_fields
+      @model.ar_model.columns.map { |col| permittable_fields << col.name.split('_cents') if col.name.include?('_cents') }
+
+      params.require(@model.name.underscore.to_sym).permit(*permittable_fields)
+    end
+
+  end
+end

data/app/javascript/packs/cm_admin/application.js

@@ -15,9 +15,11 @@ require('./filters.js')
 require('./exports.js')
 
 import jQuery from 'jquery'
+import LocalTime from "local-time"
 window.$ = jQuery
 window.jQuery = jQuery
 
+LocalTime.start()
 require("@nathanvda/cocoon")
 import "@fortawesome/fontawesome-free/css/all"
 import "daterangepicker"

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

@@ -0,0 +1,52 @@
+- edit_action = available_actions(cm_model, 'edit')
+- destroy_action = available_actions(cm_model, 'destroy')
+- custom_actions = available_actions(cm_model, 'custom_actions')
+- custom_actions_modals = custom_actions.select{ |act| act if act.display_type.eql?(:modal) }
+
+- if custom_actions.any? || edit_action.present? || destroy_action.present?
+  td.row-action-cell
+    .row-action-tool
+      button.secondary-btn.tool-btn
+        span
+          i.fa.fa-bars.bolder
+        span
+          i.fa.fa-angle-down
+      .popup-card.table-export-popup.hidden
+        - if edit_action.present?
+          = link_to "#{page_url('edit', ar_object)}" do
+            .popup-option
+              span
+                i.fa.fa-edit
+              | Edit
+        - if destroy_action.present?
+          = link_to "#{page_url('destroy', ar_object)}", method: :delete do
+            .popup-option
+              span
+                i.fa.fa-trash
+              | Destroy
+        - custom_actions.each do |custom_action|
+          - if custom_action.display_if.call(ar_object)
+            - case custom_action.display_type
+            - when :button
+              = link_to cm_admin.send("#{cm_model.name.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
+                .popup-option
+                  span
+                    i class="#{custom_action.icon_name}"
+                  = custom_action.name.humanize
+            - when :modal
+              = link_to '', data: { bs_toggle: 'modal', bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" } do
+                .popup-option
+                  span
+                    i class="#{custom_action.icon_name}"
+                  = custom_action.name.humanize
+
+- if custom_actions_modals.any?
+  - custom_actions_modals.each do |custom_action|
+    .modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id.to_s}" aria-hidden='true' aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex='1'
+      .modal-dialog
+        .modal-content
+          .modal-header
+            h5.modal-title id="#{custom_action.name.classify}ModalLabel" = custom_action.name.classify
+            button.btn-close aria-label='Close' data-bs-dismiss='modal'
+          .modal-body
+            = render partial: custom_action.partial, locals: { ar_object: ar_object }

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

@@ -36,43 +36,10 @@
                 a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/#{ar_object.id}" = show_field_value(ar_object, column)
               - else
                 span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
-          - associated_model_actions = @associated_model && @associated_model.available_actions.select{|act| act if act.route_type == 'member'}
-          - if associated_model_actions.present?
-            td.row-action-cell
-              .row-action-tool
-                button.secondary-btn.tool-btn type="button"
-                  span
-                    i.fa.fa-bars.bolder
-                  span
-                    i.fa.fa-angle-down
-                .popup-card.table-export-popup.hidden
-                  // To be added once the associated model has edit actions
-                  / .popup-option
-                  /   a href="#{page_url('edit', ar_object)}"
-                  /     | Edit
-                  - associated_model_actions.each do |custom_action|
-                    - if custom_action.display_if.call(ar_object)
-                      .popup-option
-                        - if custom_action.display_type == :button
-                          = link_to cm_admin.send("#{@associated_model.name.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
-                            span
-                              i class="#{custom_action.icon_name}"
-                            = custom_action.name.humanize
-                        - elsif custom_action.display_type == :modal
-                          = link_to custom_action.name.humanize, '', data: { bs_toggle: 'modal', bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" }
+          - if @associated_model
+            == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @associated_model, ar_object: ar_object }
 
 .cm-pagination
   .cm-pagination__lhs Showing #{@associated_ar_object.pagy.from} to #{@associated_ar_object.pagy.to} out of #{@associated_ar_object.pagy.count}
   .cm-pagination__rhs
     == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @associated_ar_object.pagy }
-
-- @associated_ar_object.data.each do |ar_object|
-  - @associated_model && @associated_model.available_actions.select{|act| act if (act.route_type == 'member' && act.display_type == :modal)}.each do |custom_action|
-    .modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id.to_s}" aria-hidden='true' aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex='1'
-      .modal-dialog
-        .modal-content
-          .modal-header
-            h5.modal-title id="#{custom_action.name.classify}ModalLabel" = custom_action.name.classify
-            button.btn-close aria-label='Close' data-bs-dismiss='modal'
-          .modal-body
-            = render partial: custom_action.partial, locals: { ar_object: ar_object }

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

@@ -31,40 +31,9 @@
                 - else
                   = show_field_value(ar_object, column)
                   - if column.field_type == :drawer
-                    = render partial: column.drawer_partial, locals: { ar_object: ar_object}
-
-          - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
-          - destroy_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('destroy')}
-          - custom_actions = @model.available_actions.select{|act| act if act.route_type == 'member' && [:button, :modal].include?(act.display_type)}
-          - if custom_actions.any? || edit_action.any? || destroy_action.any?
-            td.row-action-cell
-              .row-action-tool
-                button.secondary-btn.tool-btn type="button"
-                  span
-                    i.fa.fa-bars.bolder
-                  span
-                    i.fa.fa-angle-down
-                .popup-card.table-export-popup.hidden
-                  - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?
-                    = link_to "#{page_url('edit', ar_object)}" do
-                      .popup-option
-                        span
-                          i.fa.fa-edit
-                        | Edit
-                  - if destroy_action.any? && policy([:cm_admin, @model.name.classify.constantize]).destroy?
-                    = link_to "#{page_url('destroy', ar_object)}", method: :delete do
-                      .popup-option
-                        span
-                          i.fa.fa-trash
-                        | Destroy
-                  - custom_actions.each do |custom_action|
-                    - if custom_action.name.present? && has_valid_policy(@model.name, custom_action.name)
-                      - if custom_action.display_if.call(ar_object)
-                        = link_to cm_admin.send("#{@model.name.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
-                          .popup-option
-                            span
-                              i class="#{custom_action.icon_name}"
-                            = custom_action.name.humanize
+                    = render partial: column.drawer_partial, locals: { ar_object: ar_object }
+          - if @model
+            == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @model, ar_object: ar_object }
 
 .cm-pagination
   .cm-pagination__lhs Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}

data/cm_admin.gemspec

@@ -26,10 +26,11 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_runtime_dependency 'pagy', '~> 4.11.0'
-  spec.add_runtime_dependency 'slim', '~> 4.1.0'
-  spec.add_runtime_dependency 'webpacker', '~> 5.2.1'
   spec.add_runtime_dependency 'axlsx_rails', '~> 0.6.1'
   spec.add_runtime_dependency 'cocoon', '~> 1.2.15'
+  spec.add_runtime_dependency 'local_time', '~> 2.1.0'
+  spec.add_runtime_dependency 'pagy', '~> 4.11.0'
   spec.add_runtime_dependency 'pundit', '~> 2.2.0'
+  spec.add_runtime_dependency 'slim', '~> 4.1.0'
+  spec.add_runtime_dependency 'webpacker', '~> 5.4.3'
 end

data/lib/cm_admin/model.rb

@@ -10,18 +10,17 @@ require_relative 'models/export'
 require_relative 'models/cm_show_section'
 require_relative 'models/tab'
 require_relative 'models/dsl_method'
-require_relative 'models/controller_method'
 require 'pagy'
 require 'axlsx'
 require 'cocoon'
 require 'pundit'
+require 'local_time'
 
 module CmAdmin
   class Model
     include Pagy::Backend
     include Models::Blocks
     include Models::DslMethod
-    include Models::ControllerMethod
     attr_accessor :available_actions, :actions_set, :available_fields, :permitted_fields,
       :current_action, :params, :filters, :available_tabs, :icon_name
     attr_reader :name, :ar_model, :is_visible_on_sidebar
@@ -89,12 +88,13 @@ module CmAdmin
       @icon_name = name
     end
 
+    # Shared between export controller and resource controller
     def filter_params(params)
       # OPTIMIZE: Need to check if we can permit the filter_params in a better way
-      date_columns = @filters.select{|x| x.filter_type.eql?(:date)}.map(&:db_column_name)
-      range_columns = @filters.select{|x| x.filter_type.eql?(:range)}.map(&:db_column_name)
-      single_select_columns = @filters.select{|x| x.filter_type.eql?(:single_select)}.map(&:db_column_name)
-      multi_select_columns = @filters.select{|x| x.filter_type.eql?(:multi_select)}.map{|x| Hash["#{x.db_column_name}", []]}
+      date_columns = self.filters.select{|x| x.filter_type.eql?(:date)}.map(&:db_column_name)
+      range_columns = self.filters.select{|x| x.filter_type.eql?(:range)}.map(&:db_column_name)
+      single_select_columns = self.filters.select{|x| x.filter_type.eql?(:single_select)}.map(&:db_column_name)
+      multi_select_columns = self.filters.select{|x| x.filter_type.eql?(:multi_select)}.map{|x| Hash["#{x.db_column_name}", []]}
 
       params.require(:filters).permit(:search, date: date_columns, range: range_columns, single_select: single_select_columns, multi_select: multi_select_columns) if params[:filters]
     end
@@ -104,7 +104,7 @@ module CmAdmin
     # Controller defined for each model
     # If model is User, controller will be UsersController
     def define_controller
-      klass = Class.new(CmAdmin::ApplicationController) do
+      klass = Class.new(CmAdmin::ResourceController) do
         include Pundit::Authorization
         rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
@@ -116,68 +116,14 @@ module CmAdmin
             @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?
-            authorize controller_name.classify.constantize, policy_class: "CmAdmin::#{controller_name.classify}Policy".constantize if defined? "CmAdmin::#{controller_name.classify}Policy".constantize
-            aar_model = request.url.split('/')[-2].classify.constantize  if params[:aar_id]
-            @associated_ar_object = aar_model.find(params[:aar_id]) if params[:aar_id]
-            nested_tables = @model.available_fields[:new].except(:fields).keys
-            nested_tables += @model.available_fields[:edit].except(:fields).keys
-            @reflections = @model.ar_model.reflect_on_all_associations
-            nested_tables.each do |table_name|
-              reflection = @reflections.select {|x| x if x.name == table_name}.first
-              if reflection.macro == :has_many
-                @ar_object.send(table_name).build if action_name == "new" || action_name == "edit"
-              else
-                @ar_object.send(('build_' + table_name.to_s).to_sym) if action_name == "new"
-              end
-            end
-            respond_to do |format|
-              if %w(show index new edit).include?(action_name)
-                if request.xhr? && action_name.eql?('index')
-                  format.html { render partial: '/cm_admin/main/table' }
-                else
-                  format.html { render '/cm_admin/main/'+action_name }
-                end
-              elsif %w(create update destroy).include?(action_name)
-                if params["referrer"]
-                  redirect_url = params["referrer"]
-                elsif %w(create update).include?(action_name)
-                  redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}/#{@ar_object.id}"
-                else
-                  redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}"
-                end
-                if action_name.eql?('destroy') || @ar_object.save
-                  format.html { redirect_to  redirect_url, notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
-                else
-                  format.html { render '/cm_admin/main/new', notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is unsuccessful" }
-                end
-              elsif action.action_type == :custom
-                if action.child_records
-                  format.html { render action.layout }
-                elsif action.display_type == :page
-                  data = @action.parent == "index" ? @ar_object.data : @ar_object
-                  format.html { render action.partial }
-                else
-                  ar_object = @action.code_block.call(@ar_object)
-                  if ar_object.errors.empty?
-                    redirect_url = @model.current_action.redirection_url || @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
-                    format.html { redirect_to redirect_url, notice: "#{@action.name.titleize} is successful" }
-                  else
-                    error_messages = ar_object.errors.full_messages.map{|error_message| "<li>#{error_message}</li>"}.join
-                    format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
-                  end
-                end
-              elsif action.layout.present?
-                if request.xhr? && action.partial.present?
-                  format.html { render partial: action.partial }
-                else
-                  format.html { render action.layout }
-                end
-              end
-            end
+            send(@action.controller_action_name, params)
+            # @ar_object = @model.try(@action.parent || action_name, params)
           end
         end
+
+        def pundit_user
+          Current.user
+        end
         private
 
         def user_not_authorized

data/lib/cm_admin/models/action.rb

@@ -43,6 +43,16 @@ module CmAdmin
         self.partial = partial
       end
 
+      def controller_action_name
+        if self.action_type == :custom
+          'cm_custom_method'
+        elsif self.parent
+          'cm_' + self.parent
+        else
+          'cm_' + name
+        end
+      end
+
       class << self
         def find_by(model, search_hash)
           model.available_actions.find { |i| i.name == search_hash[:name] }

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.7.4"
+  VERSION = "0.7.7"
 end