dhatu 0.1.19 → 0.1.20

data/app/controllers/dhatu/resource_controller.rb

@@ -21,6 +21,10 @@ module Dhatu
     def configure_filter_param_mapping
       @filter_param_mapping = default_filter_param_mapping
       @filter_param_mapping[:promotion] = :pr
+      @filter_param_mapping[:category] = :ct
+      @filter_param_mapping[:category_type] = :ctype
+      @filter_param_mapping[:feature] = :ft
+      @filter_param_mapping[:featured] = :featured
     end
 
 	end

data/app/controllers/dhatu/sections_controller.rb

@@ -4,12 +4,11 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/section").permit(:section_type_id, :title, :sub_title, :short_description, :long_description, :button_one_text, :button_two_text, :button_one_link, :button_two_link, :category_id)
+      params.require("dhatu/section").permit(:page_id, :name, :title, :sub_title, :code, :short_description, :long_description, :button_one_text, :button_two_text, :button_one_link, :button_two_link, :category_id, :priority, :enable_title, :enable_sub_title, :enable_short_description, :enable_long_description, :enable_button_one, :enable_button_two, :enable_cover_image, :enable_gallery_images)
     end
 
     def get_collections
       @relation = Dhatu::Section.includes(:cover_image).where("")
-      params[:st] = "published" if params[:st].nil?
       parse_filters
       apply_filters
       @sections = @r_objects = @relation.page(@current_page).per(@per_page)
@@ -20,7 +19,7 @@ module Dhatu
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
       
-      @order_by = "created_at desc" unless @order_by
+      @order_by = "priority ASC, created_at desc" unless @order_by
       @relation = @relation.order(@order_by)
     end
 
@@ -42,7 +41,7 @@ module Dhatu
       @filter_ui_settings = {
         status: {
           object_filter: false,
-          select_label: "Select Status",
+          select_label: "Filter by Status",
           display_hash: Dhatu::Section::STATUS,
           current_value: @status,
           values: Dhatu::Section::STATUS_REVERSE,
@@ -57,12 +56,46 @@ module Dhatu
 
     def resource_controller_configuration
       {
-        page_title: "Sections",
-        js_view_path: "/kuppayam/workflows/peacock",
-        view_path: "dhatu/sections",
+        page_title: "Manage Sections",
+        current_nav: "dhatu/pages",
+
+        # Resource Names
+        class: Dhatu::Section,
         collection_name: :sections,
         item_name: :section,
-        class: Dhatu::Section
+        
+        # Conditions
+        get_collections_after_save_resource: false,
+        show_modal_after_create: true,
+        show_modal_after_update: true,
+
+        # Model Size can be large or generic
+        form_model_size: :large,
+        show_model_size: :large,
+
+        # Layout can be table or feed
+        # table uses html tables and feed uses div based boxes
+        layout: :table,
+
+        # "/kuppayam/workflows/default"
+        # 
+        # Default partial opens show and form partial according to the model_size configuration
+        # It also respect the configuration layout and refresh the page element on both cases - i.e layout is table or feed
+
+        # "/kuppayam/workflows/peacock"
+        # "/kuppayam/workflows/parrot"
+        # 
+        # Peacock & Parrot are old ways of doing things and it respects certail configurations
+        # Peacock opens show and form partials in large popup where as Parrot opens it in small
+        # Both Peacock and Parrot expect table based layout and will reload a single row after create / update
+
+        # Rendering Paths
+        view_path: "dhatu/sections",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: true,
+        tagsinput: false
       }
     end
 

data/app/controllers/dhatu/services_controller.rb

@@ -4,28 +4,41 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/service").permit(:name, :meta_description, :permalink, :description, :price, :duration, :category_id, :priority)
+      params.require("dhatu/service").permit(:name, :short_description, :permalink, :description, :price, :duration, :category_id, :priority)
     end
 
-    def get_collections
+    def load_nested_categories
       category_ids = Dhatu::Service.distinct.pluck(:category_id)
       @categories = Dhatu::Category.where(id: category_ids).to_a
       @categories.unshift(Dhatu::Category.new(id: -1, name: "All"))
+    end
 
-      @relation = Dhatu::Service.includes(:cover_image).where("")
-      # params[:st] = "published" if params[:st].nil?
-
+    def get_collections
+      # Checkout the method get_category_filters before using this method
+      # load_nested_categories
+      
+      @relation = Dhatu::Service.includes(:cover_image, :category).where("")
+      
       parse_filters
       apply_filters
+
       @services = @r_objects = @relation.page(@current_page).per(@per_page)
       return true
     end
 
     def apply_filters
-      @category = Dhatu::Category.find_by_id(params[:ct]) || Dhatu::Category.new(id: -1, name: "All")
-      
-      if @category && @category.id != -1
-        @relation = @relation.where("category_id = ?", @category.id)
+      if @category.is_a?(String)
+        @category = Dhatu::Category.new(id: -2, name: "IS NOT SET")
+      elsif @category.blank?
+        @category = Dhatu::Category.new(id: -1, name: "All")
+      end
+
+      if @category 
+        if @category.persisted?
+          @relation = @relation.where("category_id = ?", @category.id)
+        elsif @category.id == -2
+          @relation = @relation.where("category_id IS NULL")
+        end
       end
 
       @relation = @relation.search(@query) if @query
@@ -41,8 +54,9 @@ module Dhatu
         ],
 
         boolean_filters: [],
-
-        reference_filters: [],
+        reference_filters: [
+          { filter_name: :category, filter_class: Dhatu::Category },
+        ],
         variable_filters: [],
       }
     end
@@ -51,27 +65,73 @@ module Dhatu
       @filter_ui_settings = {
         status: {
           object_filter: false,
-          select_label: "Select Status",
-          display_hash: Dhatu::Service::STATUS,
+          select_label: "Filter by Status",
+          display_hash: Dhatu::Service::STATUS_REVERSE,
           current_value: @status,
-          values: Dhatu::Service::STATUS_REVERSE,
+          values: Dhatu::Service::STATUS,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
           url_method_name: 'services_url',
           show_all_filter_on_top: true
+        },
+        category: {
+          object_filter: true,
+          select_label: 'Select Category Type',
+          current_value: @category,
+          values: Dhatu::Category.filter_by_category_type("Dhatu::Service").published.order("priority ASC, name ASC").all,
+          current_filters: @filters,
+          url_method_name: 'services_url',
+          filters_to_remove: [],
+          filters_to_add: {},
+          show_null_filter_on_top: true,
+          show_all_filter_on_top: true
         }
       }
     end
 
     def resource_controller_configuration
       {
-        page_title: "Services",
-        js_view_path: "/kuppayam/workflows/peacock",
-        view_path: "dhatu/services",
+        page_title: "Manage Services",
+        current_nav: "dhatu/services",
+
+        # Resource Names
+        class: Dhatu::Service,
         collection_name: :services,
         item_name: :service,
-        class: Dhatu::Service
+        
+        # Conditions
+        get_collections_after_save_resource: false,
+        show_modal_after_create: true,
+        show_modal_after_update: true,
+
+        # Model Size can be large or generic
+        form_model_size: :large,
+        show_model_size: :large,
+
+        # Layout can be table or feed
+        # table uses html tables and feed uses div based boxes
+        layout: :table,
+
+        # "/kuppayam/workflows/default"
+        # 
+        # Default partial opens show and form partial according to the model_size configuration
+        # It also respect the configuration layout and refresh the page element on both cases - i.e layout is table or feed
+
+        # "/kuppayam/workflows/peacock"
+        # "/kuppayam/workflows/parrot"
+        # 
+        # Peacock & Parrot are old ways of doing things and it respects certail configurations
+        # Peacock opens show and form partials in large popup where as Parrot opens it in small
+        # Both Peacock and Parrot expect table based layout and will reload a single row after create / update
+
+        # Rendering Paths
+        view_path: "dhatu/services",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: true,
+        tagsinput: false
       }
     end
 

data/app/controllers/dhatu/team_members_controller.rb

@@ -9,7 +9,6 @@ module Dhatu
 
     def get_collections
       @relation = Dhatu::TeamMember.includes(:profile_image).where("")
-      params[:st] = "published" if params[:st].nil?
       parse_filters
       apply_filters
       @team_members = @r_objects = @relation.page(@current_page).per(@per_page)
@@ -40,10 +39,10 @@ module Dhatu
       @filter_ui_settings = {
         status: {
           object_filter: false,
-          select_label: "Select Status",
-          display_hash: Dhatu::TeamMember::STATUS,
+          select_label: "Filter by Status",
+          display_hash: Dhatu::TeamMember::STATUS_REVERSE,
           current_value: @status,
-          values: Dhatu::TeamMember::STATUS_REVERSE,
+          values: Dhatu::TeamMember::STATUS,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
@@ -55,12 +54,46 @@ module Dhatu
 
     def resource_controller_configuration
       {
-        page_title: "Team",
-        js_view_path: "/kuppayam/workflows/peacock",
-        view_path: "dhatu/team_members",
+        page_title: "Manage Teams",
+        current_nav: "dhatu/team_members",
+
+        # Resource Names
+        class: Dhatu::TeamMember,
         collection_name: :team_members,
         item_name: :team_member,
-        class: Dhatu::TeamMember
+        
+        # Conditions
+        get_collections_after_save_resource: false,
+        show_modal_after_create: true,
+        show_modal_after_update: true,
+
+        # Model Size can be large or generic
+        form_model_size: :large,
+        show_model_size: :large,
+
+        # Layout can be table or feed
+        # table uses html tables and feed uses div based boxes
+        layout: :table,
+
+        # "/kuppayam/workflows/default"
+        # 
+        # Default partial opens show and form partial according to the model_size configuration
+        # It also respect the configuration layout and refresh the page element on both cases - i.e layout is table or feed
+
+        # "/kuppayam/workflows/peacock"
+        # "/kuppayam/workflows/parrot"
+        # 
+        # Peacock & Parrot are old ways of doing things and it respects certail configurations
+        # Peacock opens show and form partials in large popup where as Parrot opens it in small
+        # Both Peacock and Parrot expect table based layout and will reload a single row after create / update
+
+        # Rendering Paths
+        view_path: "dhatu/team_members",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: true,
+        tagsinput: false
       }
     end
 

data/app/controllers/dhatu/testimonials_controller.rb

@@ -9,7 +9,6 @@ module Dhatu
 
     def get_collections
       @relation = Dhatu::Testimonial.includes(:profile_image, :logo_image).where("")
-      params[:st] = "published" if params[:st].nil?
       parse_filters
       apply_filters
       @testimonials = @r_objects = @relation.page(@current_page).per(@per_page)
@@ -30,7 +29,6 @@ module Dhatu
         ],
 
         boolean_filters: [],
-
         reference_filters: [],
         variable_filters: [],
       }
@@ -40,10 +38,10 @@ module Dhatu
       @filter_ui_settings = {
         status: {
           object_filter: false,
-          select_label: "Select Status",
-          display_hash: Dhatu::Testimonial::STATUS,
+          select_label: "Filter by Status",
+          display_hash: Dhatu::Testimonial::STATUS_REVERSE,
           current_value: @status,
-          values: Dhatu::Testimonial::STATUS_REVERSE,
+          values: Dhatu::Testimonial::STATUS,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
@@ -55,12 +53,46 @@ module Dhatu
 
     def resource_controller_configuration
       {
-        page_title: "Testimonials",
-        js_view_path: "/kuppayam/workflows/peacock",
-        view_path: "dhatu/testimonials",
+        page_title: "Manage Testimonials",
+        current_nav: "dhatu/testimonials",
+
+        # Resource Names
+        class: Dhatu::Testimonial,
         collection_name: :testimonials,
         item_name: :testimonial,
-        class: Dhatu::Testimonial
+        
+        # Conditions
+        get_collections_after_save_resource: false,
+        show_modal_after_create: true,
+        show_modal_after_update: true,
+
+        # Model Size can be large or generic
+        form_model_size: :large,
+        show_model_size: :large,
+
+        # Layout can be table or feed
+        # table uses html tables and feed uses div based boxes
+        layout: :table,
+
+        # "/kuppayam/workflows/default"
+        # 
+        # Default partial opens show and form partial according to the model_size configuration
+        # It also respect the configuration layout and refresh the page element on both cases - i.e layout is table or feed
+
+        # "/kuppayam/workflows/peacock"
+        # "/kuppayam/workflows/parrot"
+        # 
+        # Peacock & Parrot are old ways of doing things and it respects certail configurations
+        # Peacock opens show and form partials in large popup where as Parrot opens it in small
+        # Both Peacock and Parrot expect table based layout and will reload a single row after create / update
+
+        # Rendering Paths
+        view_path: "dhatu/testimonials",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: true,
+        tagsinput: false
       }
     end
 

data/app/models/dhatu/blog_post.rb

@@ -13,7 +13,7 @@ class Dhatu::BlogPost < Dhatu::ApplicationRecord
   validates :author, length: {minimum: 3, maximum: 250}, allow_blank: true
   validates :description, presence: true
   validates :posted_at, presence: true
-  validates :meta_description, presence: true, length: {minimum: 10, maximum: 500}, allow_blank: false
+  validates :short_description, presence: true, length: {minimum: 10, maximum: 500}, allow_blank: false
 
   validates :category, presence: true
   
@@ -22,6 +22,10 @@ class Dhatu::BlogPost < Dhatu::ApplicationRecord
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
   has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
 
+  # Meta Tag Associations
+  has_one :og_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::OgImage"
+  has_many :meta_tags, :as => :meta_taggable, :dependent => :destroy, :class_name => "Dhatu::MetaTag"
+
   # Serializers
   serialize :tags, Hash
   
@@ -54,7 +58,7 @@ class Dhatu::BlogPost < Dhatu::ApplicationRecord
     blog_post.title = hsh[:title].to_s.strip
     blog_post.slug = blog_post.title.parameterize[0..64] if blog_post.title
     blog_post.author = hsh[:author].to_s.strip
-    blog_post.meta_description = hsh[:meta_description].to_s.strip
+    blog_post.short_description = hsh[:short_description].to_s.strip
     blog_post.description = hsh[:description].to_s.strip
     blog_post.posted_at = hsh[:posted_at].to_s.strip
 

data/app/models/dhatu/category.rb

@@ -102,9 +102,9 @@ class Dhatu::Category < Dhatu::ApplicationRecord
     self.name
   end
 
-  def to_param
-    "#{id}-#{name.parameterize[0..32]}"
-  end
+  # def to_param
+  #   "#{id}-#{name.parameterize[0..32]}"
+  # end
 
   def display_category_type
     self.category_type.try(:demodulize).try(:pluralize).try(:titleize)

data/app/models/dhatu/event.rb

@@ -16,6 +16,10 @@ class Dhatu::Event < Dhatu::ApplicationRecord
   belongs_to :category, optional: true
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
   has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
+
+  # Meta Tag Associations
+  has_one :og_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::OgImage"
+  has_many :meta_tags, :as => :meta_taggable, :dependent => :destroy, :class_name => "Dhatu::MetaTag"
   
   # ------------------
   # Class Methods

data/app/models/dhatu/meta_tag.rb

@@ -0,0 +1,48 @@
+class Dhatu::MetaTag < Dhatu::ApplicationRecord
+
+  # Constants
+  META_TYPES = ["Default", "Open Graph", "Twitter", "Facebook", "Other"]
+
+  # Set Table Name
+  self.table_name = "meta_tags"
+
+  # Including the State Machine Methods
+  include Publishable
+
+  # Validations
+  validates :meta_type, presence: true, length: {minimum: 3, maximum: 16}, allow_blank: false
+  validates :meta_key, presence: true, length: {minimum: 1, maximum: 128}, allow_blank: false
+  validates :meta_value, presence: true, length: {minimum: 1, maximum: 1064}, allow_blank: false
+  
+  # Associations
+  belongs_to :meta_taggable, :polymorphic => true
+
+  # ------------------
+  # Class Methods
+  # ------------------
+
+  scope :search, lambda { |query| where("LOWER(meta_type) LIKE LOWER('%#{query}%') OR LOWER(meta_key) LIKE LOWER('%#{query}%') OR LOWER(meta_value) LIKE LOWER('%#{query}%')") }
+
+  # ------------------
+  # Instance Methods
+  # ------------------
+
+  # Generic Methods
+  # ---------------
+
+  def display_name
+    "#{self.meta_type_was} - #{self.meta_key_was}"
+  end
+
+  # Permission Methods
+  # ------------------
+
+  def can_be_edited?
+    status?(:published) or status?(:unpublished)
+  end
+
+  def can_be_deleted?
+    status?(:removed)
+  end
+  
+end