dhatu 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f96798ea3a6687453e80d811e106c2b00d6724da2cd2ec7414a186681fb93df6
-  data.tar.gz: 91e348a89e091973132c6b255a5aa3d0ce9b38a9cfa432001db2d86ebd776bca
+  metadata.gz: ca0bd76d3e2830b603f692a4758bd8757984cceca3caf8f2e5c366340bc5a400
+  data.tar.gz: 60bfc25d39b31268ebf620dbe180337401f913912aeca547ab387aafcb0582e4
 SHA512:
-  metadata.gz: 95c2d7ff1f07934e0fd7c2a7e1d35c2e869a521f5e67dce854d0c3a280f0215215a73b378d81baece6d5a03aa8b8c2b36163111f2c3ecaaf7efcdcb36c59a20e
-  data.tar.gz: bd5684b3f14d216d384f25b73c4b3dec8d317de91d319aa03d2cc110f946a36555699e1d31febfaa5bd035eb5080fc286b6f4a6c9efc1255ed7be9030894a490
+  metadata.gz: 1cd21dba9cb6ade7f8dffe115ae9e0ca6a66c6e71181a3d51818bf0dec7732010d2d0190815da29bf5892c5ae0125c3e6f32648338167191a8e62fe674e9a72d
+  data.tar.gz: 34b075a08759dab72493ecae37194bda0392e1eb4e14ed93a7b890610d4acd314ac541979c536932adbdde9ea855d4f06f9f3ec6fc9e6503c3ee5581e0cd4e1f

data/app/controllers/dhatu/blog_posts_controller.rb

@@ -10,26 +10,45 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/blog_post").permit(:title, :slug, :author, :meta_description, :description, :posted_at, :tags, :category_id)
+      params.require("dhatu/blog_post").permit(:title, :slug, :author, :short_description, :description, :posted_at, :tags, :category_id)
+    end
+
+    def load_nested_categories
+      # Checkout the method get_category_filters before using this method
+      category_ids = Dhatu::BlogPost.distinct.pluck(:category_id)
+      @categories = Dhatu::Category.where(id: category_ids).to_a
+      @categories.unshift(Dhatu::Category.new(id: -1, name: "All"))
     end
 
     def get_collections
+      # Checkout the method get_category_filters before using this method
+      # load_nested_categories
+
       get_category_filters("Dhatu::BlogPost")
-      @relation = Dhatu::BlogPost.includes(:cover_image).where("")
+      @relation = Dhatu::BlogPost.includes(:cover_image, :category).where("")
+
       parse_filters
       apply_filters
+
       @blog_posts = @r_objects = @relation.page(@current_page).per(@per_page)
       return true
     end
 
     def apply_filters
-      if @category
-        if @category.id == -1
-          @relation = @relation.where("category_id is NULL")
-        else
+      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
       @relation = @relation.status(@status) if @status
       @order_by = "posted_at desc, created_at desc" unless @order_by
@@ -43,7 +62,9 @@ module Dhatu
           { filter_name: :status }
         ],
         boolean_filters: [],
-        reference_filters: [],
+        reference_filters: [
+          { filter_name: :category, filter_class: Dhatu::Category },
+        ],
         variable_filters: [],
       }
     end
@@ -52,27 +73,73 @@ module Dhatu
       @filter_ui_settings = {
         status: {
           object_filter: false,
-          select_label: "Select Status",
-          display_hash: Dhatu::BlogPost::STATUS,
+          select_label: "Filter by Status",
+          display_hash: Dhatu::BlogPost::STATUS_REVERSE,
           current_value: @status,
-          values: Dhatu::BlogPost::STATUS_REVERSE,
+          values: Dhatu::BlogPost::STATUS,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
           url_method_name: 'blog_posts_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::BlogPost").published.order("priority ASC, name ASC").all,
+          current_filters: @filters,
+          url_method_name: 'blog_posts_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: "Blog",
-        js_view_path: "/kuppayam/workflows/peacock",
-        view_path: "dhatu/blog_posts",
+        page_title: "Manage Blog",
+        current_nav: "dhatu/blog_posts",
+
+        # Resource Names
+        class: Dhatu::BlogPost,
         collection_name: :blog_posts,
         item_name: :blog_post,
-        class: Dhatu::BlogPost
+        
+        # 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/blog_posts",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: true,
+        tagsinput: false
       }
     end
 

data/app/controllers/dhatu/bookings_controller.rb

@@ -38,24 +38,70 @@ module Dhatu
         ],
 
         boolean_filters: [],
-
         reference_filters: [],
         variable_filters: [],
       }
     end
 
     def configure_filter_ui_settings
-      @filter_ui_settings = {}
+      @filter_ui_settings = {
+        status: {
+          object_filter: false,
+          select_label: "Filter by Status",
+          display_hash: Dhatu::Booking::STATUS_REVERSE,
+          current_value: @status,
+          values: Dhatu::Booking::STATUS,
+          current_filters: @filters,
+          filters_to_remove: [],
+          filters_to_add: {},
+          url_method_name: 'bookings_url',
+          show_all_filter_on_top: true
+        }
+      }
     end
 
     def resource_controller_configuration
       {
         page_title: "Bookings",
-        js_view_path: "/kuppayam/workflows/peacock",
-        view_path: "dhatu/bookings",
+        current_nav: "dhatu/bookings",
+
+        # Resource Names
+        class: Dhatu::Booking,
         collection_name: :bookings,
         item_name: :booking,
-        class: Dhatu::Booking
+        
+        # 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/bookings",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: true,
+        tagsinput: false
       }
     end
 

data/app/controllers/dhatu/branches_controller.rb

@@ -41,7 +41,7 @@ module Dhatu
 
     def get_collections
       @relation = Dhatu::Branch.where("")
-      params[:st] = "published" if params[:st].nil?
+      # params[:st] = "published" if params[:st].nil?
       parse_filters
       apply_filters
       @branches = @r_objects = @relation.page(@current_page).per(@per_page)
@@ -74,10 +74,10 @@ module Dhatu
       @filter_ui_settings = {
         status: {
           object_filter: false,
-          select_label: "Select Status",
-          display_hash: Dhatu::Branch::STATUS,
+          select_label: "Filter by Status",
+          display_hash: Dhatu::Branch::STATUS_REVERSE,
           current_value: @status,
-          values: Dhatu::Branch::STATUS_REVERSE,
+          values: Dhatu::Branch::STATUS,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
@@ -89,12 +89,46 @@ module Dhatu
 
     def resource_controller_configuration
       {
-        page_title: "Branch",
-        js_view_path: "/kuppayam/workflows/peacock",
-        view_path: "dhatu/branches",
+        page_title: "Manage Branchs",
+        current_nav: "dhatu/branches",
+
+        # Resource Names
+        class: Dhatu::Branch,
         collection_name: :branches,
         item_name: :branch,
-        class: Dhatu::Branch
+        
+        # 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/branches",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: false,
+        tagsinput: false
       }
     end
 

data/app/controllers/dhatu/categories_controller.rb

@@ -1,8 +1,11 @@
 module Dhatu
   class CategoriesController < ResourceController
     
+    before_action :get_filters
     before_action :require_update_permission, only: [:update_status, :make_parent, :mark_as_featured, :remove_from_featured]
-    before_action :get_features
+
+    def choose_category_type
+    end
 
     def update_status
       @category = @r_object = Dhatu::Category.find(params[:id])
@@ -39,17 +42,21 @@ module Dhatu
 
     private
 
+    def get_filters
+      @features = Feature.categorisable.published.order("name ASC").all
+    end
+
     def save_resource
       if @r_object.valid?
         previous_parent_id = @r_object.parent_id_was
         @r_object.save
         if @r_object.parent_id != previous_parent_id
-          @r_object.parent.set_end_node!
+          @r_object.parent.set_end_node! if @r_object.parent
           previous_category = Dhatu::Category.find_by_id(previous_parent_id)
           previous_category.set_end_node! if previous_category
         end
 
-        get_collections if @resource_options[:layout] = :table
+        get_collections if @resource_options[:layout] == :table
         set_flash_message(I18n.translate("forms.save", item: default_item_name.titleize), :success) 
       end
       set_resource_notification(@r_object)
@@ -58,59 +65,41 @@ module Dhatu
       render_or_redirect(@r_object.errors.any?, url, action_name)
     end
 
-    def get_features
-      @features = Feature.categorisable.published.order("name ASC").all
-    end
-
-    def permitted_params
-      params[:category].permit(:name, :permalink, :one_liner, :description, :parent_id, :priority, :category_type)
-    end
-
-    def set_navs
-      set_nav("admin/categories")
-    end
-
     def get_collections
+
       @current_category = Dhatu::Category.find_by_id(params[:parent_id])
 
       filter_param_mapping
+
       parse_filters
 
-      if @query
-        @relation = Dhatu::Category.includes(:parent)
+      if @feature.blank? && @current_category
+        @feature = Feature.find_by_name(@current_category.category_type)
+      end
+
+      if @current_category
+        @relation = @current_category.sub_categories.includes(:parent)
       else
-        if @current_category
-          @relation = @current_category.sub_categories.includes(:parent)
-        else
-          @relation = Dhatu::Category.where("parent_id IS NULL")
-        end
+        @relation = Dhatu::Category.where("parent_id IS NULL")
       end
-      
-      @relation = @relation.order("priority ASC, name ASC")
+
       apply_filters
+
+      @relation = @relation.order("priority ASC, name ASC")
+      
       @categories = @r_objects = @relation.page(@current_page).per(@per_page)
       return true
     end
 
     def apply_filters
-      @category_type = params[:category_type] || "All"
-      case @category_type 
-      when "none"
-        @relation = @relation.joins("LEFT JOIN features f on f.name = categories.category_type").where("f.name is NULL")
-      when "all_including_children"
-        @relation = Dhatu::Category.where("")
-      when "All"
-        @relation = @relation.where("")
-      else 
-        @relation = @relation.where("category_type = ?", params[:category_type])
-      end
+      @relation = @relation.where("category_type = ?", @feature.name) if @feature
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
-      @relation = @relation.featured(@featured) unless @featured.nil?
+      # @relation = @relation.featured(@featured) unless @featured.nil?
     end
 
-    def filter_config
-      @filter_config = {
+    def configure_filter_settings
+      @filter_settings = {
         boolean_filters: [
           { filter_name: :featured }
         ],
@@ -118,19 +107,72 @@ module Dhatu
           { filter_name: :query },
           { filter_name: :status }
         ],
-        reference_filters: [],
+        reference_filters: [
+          { filter_name: :feature, filter_class: Feature },
+        ],
         variable_filters: [],
       }
     end
 
     def resource_controller_configuration
       {
-        page_title: "Categories",
-        js_view_path: "/kuppayam/workflows/peacock",
-        view_path: "/dhatu/categories",
+        page_title: "Manage Categories",
+        current_nav: "dhatu/categories",
+
+        # Resource Names
+        class: Dhatu::Category,
         collection_name: :categories,
         item_name: :category,
-        class: Dhatu::Category
+        
+        # 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: :generic,
+        show_model_size: :generic,
+
+        # Layout can be table or feed
+        # table uses html tables and feed uses div based boxes
+        layout: :feed,
+
+        # "/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/categories",
+        js_view_path: "/kuppayam/workflows/default",
+
+        # Additional Configurations
+        load_wysihtml5: false,
+        tagsinput: false
+      }
+    end
+
+    def configure_filter_ui_settings
+      @filter_ui_settings = {
+        feature: {
+          object_filter: true,
+          select_label: 'Select Category Type',
+          current_value: @feature,
+          values: Feature.published.where("categorisable = true").order("name ASC").all,
+          current_filters: @filters,
+          url_method_name: 'categories_url',
+          filters_to_remove: [],
+          filters_to_add: {},
+          show_null_filter_on_top: false,
+          show_all_filter_on_top: true
+        }
       }
     end
 
@@ -147,10 +189,7 @@ module Dhatu
     def permitted_params
       params.require("dhatu/category").permit(:name, :one_liner, :description, :priority, :parent_id, :category_type)
     end
-
-    def set_navs
-      set_nav("dhatu/categories")
-    end
+    
 
   end
 end