cm-admin 0.8.9 → 0.9.0

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -11,7 +11,14 @@ module CmAdmin
 
       def show_field_label(ar_object, field)
         content_tag(:div, class: "info-split__lhs") do
-          p = field.label.present? ? field.label.to_s : field.field_name.to_s.titleize
+          field_label = if field.label.present?
+                          field.label.to_s
+                        elsif field.association_type.to_s == "polymorphic"
+                          ar_object.send(field.association_name).class.to_s.titleize
+                        else
+                          field.field_name.to_s.titleize
+                        end
+          p = field_label
         end
       end
 
@@ -73,6 +80,14 @@ module CmAdmin
               image_tag('https://cm-admin.s3.ap-south-1.amazonaws.com/gem_static_assets/image_not_available.png', height: 50, width: 50)
             end
           end
+        when :association
+          if field.association_type.to_s == 'polymorphic'
+            association_name = ar_object.send(field.association_name).class.to_s.underscore
+            field_name = find_field_name(field, association_name)
+            link_to ar_object.send(field.association_name).send(field_name), cm_admin.send("#{association_name}_show_path", ar_object.send(field.association_name).id)
+          elsif ['belongs_to', 'has_one'].include? field.association_type.to_s
+            link_to ar_object.send(field.association_name).send(field.field_name), cm_admin.send("#{field.association_name}_show_path", ar_object.send(field.association_name).id)
+          end
         end
       end
 
@@ -92,6 +107,11 @@ module CmAdmin
         end
       end
 
+      def find_field_name(field, association_name)
+        field.field_name.each do |hash|
+          return hash[association_name.to_sym] if hash.has_key?(association_name.to_sym)
+        end
+      end
     end
   end
 end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -71,14 +71,18 @@ module CmAdmin
 
       def custom_action_button(custom_action, current_action_name)
         if current_action_name == "index"
-          link_to custom_action.name.titleize, @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb
+          link_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb
         elsif current_action_name == "show"
-          link_to custom_action.name.titleize, custom_action.path.gsub(':id', params[:id]), class: 'secondary-btn ml-2', method: custom_action.verb
+          link_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'secondary-btn ml-2', method: custom_action.verb
         end
       end
 
       def custom_modal_button(custom_action)
-        link_to custom_action.name.titleize, '', class: 'secondary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+        link_to custom_action_title(custom_action), '', class: 'secondary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+      end
+
+      def custom_action_title(custom_action)
+         custom_action.display_name.to_s.presence || custom_action.name.to_s.titleize
       end
     end
   end