dhatu 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '081c3b426eb7136d392844e905662d48468f3ca8'
-  data.tar.gz: d0d80ccbd33b16435c8c1091d799d9ce5acf3019
+  metadata.gz: 4bf01e6348dbd1e36eda6fdb715f8a0f4b263c23
+  data.tar.gz: cd49b8e0823e61004aee6ed689f47a851caccb86
 SHA512:
-  metadata.gz: 9064518b345800624470acb3ca70383d3b18e337ab4ebf501bf1d3be8f724d747907c2314f01c76ff5b31aee91995a58b56473e01dbff9af1ee0a447122ae899
-  data.tar.gz: b4065b4b48cbc61e1d59eeb7d1ce9e7774fa9f86324ec3d7c1dd0197955288897abf151ac57d41f1833051483fbac98590505be46b29c1ac498c6fbb93c8b793
+  metadata.gz: b130516a2a5992a155772813047131f0e0b540a2e43d6b7e2b419979b3ac83b8ffdfece6714afbc34642cb492f600c2723b13fc06d3070181bf2b0db642426d6
+  data.tar.gz: bef9428021bbf487d6e0291bca54e454c10d52986e33673bde70602ce44c6794cb8a822397fae8be0860864129fad0a1a2c19c9a9b741627d9c3d13c93d07cd9

data/app/controllers/dhatu/blog_posts_controller.rb

@@ -2,7 +2,7 @@ module Dhatu
   class BlogPostsController < ResourceController
 
     def new
-      get_category
+      get_category_filters("Dhatu::BlogPost")
       @r_object = @blog_post = Dhatu::BlogPost.new(category: @category)
       render_accordingly
     end
@@ -14,23 +14,14 @@ module Dhatu
     end
 
     def get_collections
+      get_category_filters("Dhatu::BlogPost")
       @relation = Dhatu::BlogPost.includes(:cover_image).where("")
-      get_category
       parse_filters
       apply_filters
       @blog_posts = @r_objects = @relation.page(@current_page).per(@per_page)
       return true
     end
 
-    def get_category
-      if params[:ct].to_s == "-1"
-        @category = Dhatu::Category.new(id: -1, name: "None")
-      elsif params[:ct]
-        @category = Dhatu::Category.find_by_id(params[:ct])
-      end
-      @categories = Dhatu::Category.where(category_type: "Dhatu::BlogPost").all
-    end
-
     def apply_filters
       if @category
         if @category.id == -1
@@ -39,11 +30,9 @@ module Dhatu
           @relation = @relation.where("category_id = ?", @category.id)
         end
       end
-
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
-      
-      @order_by = "created_at desc" unless @order_by
+      @order_by = "posted_at desc, created_at desc" unless @order_by
       @relation = @relation.order(@order_by)
     end
 
@@ -53,9 +42,7 @@ module Dhatu
           { filter_name: :query },
           { filter_name: :status }
         ],
-
         boolean_filters: [],
-
         reference_filters: [],
         variable_filters: [],
       }

data/app/controllers/dhatu/prices_controller.rb

@@ -8,9 +8,7 @@ module Dhatu
     end
 
     def get_collections
-      @categories = Dhatu::Category.where(category_type: "Dhatu::Price").all
-      @categories.unshift(Dhatu::Category.new(id: -1, name: "All"))
-
+      get_category_filters("Dhatu::Price")
       @relation = Dhatu::Price.where("")
       parse_filters
       apply_filters
@@ -19,15 +17,18 @@ module Dhatu
     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
+        if @category.id == -1
+          @relation = @relation.where("category_id is NULL")
+        else
+          @relation = @relation.where("category_id = ?", @category.id)
+        end
       end
-
+      
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
-      @relation = @relation.order("priority ASC, title ASC")
+      @order_by = "priority ASC, title ASC" unless @order_by
+      @relation = @relation.order(@order_by)
     end
 
     def configure_filter_settings
@@ -38,7 +39,6 @@ module Dhatu
         ],
 
         boolean_filters: [],
-
         reference_filters: [],
         variable_filters: [],
       }
@@ -83,7 +83,7 @@ module Dhatu
     end
 
     def set_navs
-      set_nav("price")
+      set_nav("dhatu/price")
     end
   end
 end

data/app/controllers/dhatu/resource_controller.rb

@@ -9,5 +9,14 @@ module Dhatu
     before_action :require_update_permission, only: [:update, :update_status, :mark_as_featured, :remove_from_featured]
     before_action :require_delete_permission, only: [:destroy]
 
+    def get_category_filters(category_type)
+      if params[:ct].to_s == "-1"
+        @category = Dhatu::Category.new(id: -1, name: "None")
+      elsif params[:ct]
+        @category = Dhatu::Category.find_by_id(params[:ct])
+      end
+      @categories = Dhatu::Category.where(category_type: category_type).order("priority ASC, name ASC").all
+    end
+
 	end
 end

data/app/models/dhatu/category.rb

@@ -148,7 +148,7 @@ class Dhatu::Category < Dhatu::ApplicationRecord
   end
 
   def set_end_node_of_parent
-    self.parent.set_end_node! if self.parent && self.parent_id_changed?
+    self.parent.set_end_node! if self.parent
   end
 
   protected

data/app/views/dhatu/blog_posts/_show.html.erb

@@ -20,6 +20,8 @@
 
       <%= theme_panel_sub_heading(@blog_post.author, "#") if @blog_post.author %>
       
+      <%= clear_tag(10) %>
+      <span class="mr-5 mt-5 badge badge-warning"><%= @blog_post.category.try(:name) %></span>
       <%= clear_tag(10) %>
 
       <%= display_publishable_status(@blog_post) %>

data/app/views/dhatu/categories/_index.html.erb

@@ -48,7 +48,8 @@
 			<tr> 
 				<th style="text-align: center;width:60px">#</th> 
 				<th>Name</th>
-				<th>Type</th>
+				<th>Category Type</th>
+				<th>Priority</th>
 				<!-- <th>Parent</th>
 				<th>Top Parent</th> -->
 				<th style="text-align: center;width:100px;">Status</th>
@@ -79,6 +80,7 @@
 		      <% end %>
 
 		      <td><%= category.display_category_type %></td>
+		      <td><%= category.priority %></td>
 
 		      <td class="hidden-sm hidden-xs"><%= display_publishable_status(category) %></td>
 
@@ -86,6 +88,7 @@
 			    <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(category) %></td>
 
 			    <td class="action-links hidden-sm hidden-xs" style="width:10%">
+			    	<%= link_to raw("<i class=\"linecons-desktop\"></i> View Details"), category_path(category), :remote=>true, style: "color:#40bbea" %>
 			      <%= display_manage_links(category, @current_user) %>
 			    </td>
 			    <% end %>

data/app/views/dhatu/categories/_row.html.erb

@@ -16,75 +16,17 @@
   <% end %>
 
   <td><%= category.display_category_type %></td>
+  <td><%= category.priority %></td>
 
-  <!--
-  <%# if category.parent == @current_category %>
-    <td class="category-name"><%#= category.parent.display_name if category.parent  %></td>
-  <%# else %>
-    <td class="category-name"><%#= link_to category.parent.display_name, categories_path(parent_id: category.parent.id), remote: true if category.parent %></td>
-  <%# end %>
-
-  <%# if category.top_parent == @current_category %>
-    <td class="category-name"><%#= category.top_parent.display_name if category.top_parent %></td>
-  <%# else %>
-    <td class="category-name"><%#= link_to category.top_parent.display_name, categories_path(parent_id: category.top_parent.id), remote: true if category.top_parent  %></td>
-  <%# end %>
-  -->
-
-  <td style="text-align: center;width:100px;">
-    <% if category.unpublished? %>
-      <span class="ml-5 mt-5 label label-default">Un-Published</span>
-    <% elsif category.published? %>
-      <span class="ml-5 mt-5 label label-success">Published</span>
-    <% elsif category.removed? %>
-      <span class="ml-5 mt-5 label label-danger">Disabled</span>
-    <% end %>
-  </td>
-
-  <!-- 
-  <td style="text-align: center;width:100px;"><%#= category.priority if category.priority %></td>
-  <td style="text-align: center;width:120px;"><%#= category.end_node.to_s.titleize %></td>
-  -->
+  <td class="hidden-sm hidden-xs"><%= display_publishable_status(category) %></td>
 
   <% if display_manage_links? %>
-  <% edit_link = edit_category_path(id: category.id) %>
-  <% delete_link = category_path(id: category.id) %>
-
-  <td class="action-links" style="width:10%">
-
-    <% case category.status %>
-    <% when "published" %>
-      <!-- Un-Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_category_path(:id =>category.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"category_status" if category.can_be_unpublished? %>
-      
-      <!-- Remove -->
-      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Remove"), update_status_category_path(:id =>category.id, :status =>'removed'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"category_status" if category.can_be_removed? %>
-    <% when "unpublished" %>
-      <!-- Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_category_path(:id =>category.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"category_status" if category.can_be_published? %>
-      <!-- Remove -->
-      <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Remove"), update_status_category_path(:id =>category.id, :status =>'removed'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"category_status" if category.can_be_removed? %>
-    <% when "removed" %>
-      <!-- Un-Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_category_path(:id =>category.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"category_status" if category.can_be_unpublished? %>
-      <!-- Publish -->
-      <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_category_path(:id =>category.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1",:class=>"category_status" if category.can_be_published? %>
-    <% end %>
-    
-  </td>
-
-  <td class="action-links" style="width:10%">
+  <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(category) %></td>
 
+  <td class="action-links hidden-sm hidden-xs" style="width:10%">
     <%= link_to raw("<i class=\"linecons-desktop\"></i> View Details"), category_path(category), :remote=>true, style: "color:#40bbea" %>
-
-    <%= link_to raw("<i class=\"fa-plus\"></i> Add Sub Category"), new_category_path(parent_id: category.id), :remote=>true, class: "edit" %>
-
-    <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Category"), edit_link, :remote=>true, class: "edit1" if category.can_be_edited? %>
-
-    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" if category.can_be_deleted? && display_delete_links? %>
-
+    <%= display_manage_links(category, @current_user) %>
   </td>
-
   <% end %>
 
 </tr>

data/app/views/dhatu/dashboard/index.html.erb

@@ -5,14 +5,4 @@
 <%= render partial: "usman/dashboard/super_admin_index" if @current_user.super_admin? %>
 
 <!-- Manage Location -->
-<%= render partial: "pattana/dashboard/index" %>
-
-<div style="border-top:1px solid #FFF;margin-top:50px;margin-bottom:70px;"></div>
-
-<div class="dx-warning mt-60">
-	<div>
-		<h2>Usman - API Documentation</h2>
-		<p>All APIs are documented with all cases and examples.</p>
-		<a class="btn btn-success" href="/docs/api/v1/register" target="_blank">Go to the API Documentation</a>
-	</div>
-</div>
+<%= render partial: "pattana/dashboard/index" %>

data/app/views/dhatu/prices/_index.html.erb

@@ -5,6 +5,7 @@
 				<th style="text-align: center;width:5%">#</th> 
 				<th>Item</th>
 				<th style="width:200px">Price</th>
+				<th>Priority</th>
 				<th style="width:100px;" class="hidden-sm hidden-xs">Status</th>
 				<% if display_manage_links? %>
 				<th style="text-align: center;" colspan="2" class="hidden-sm hidden-xs" >Actions</th>
@@ -26,7 +27,7 @@
 					</td>
 
 					<td class="hidden-sm hidden-xs"><%= price.price %></td>
-
+					<td class="hidden-sm hidden-xs"><%= price.priority %></td>
 					<td class="hidden-sm hidden-xs"><%= display_publishable_status(price) %></td>
 
 		      <% if display_manage_links? %>

data/app/views/dhatu/prices/index.html.erb

@@ -5,11 +5,17 @@
     <div class="tabs-vertical-env">
 
       <ul id="div_category_types" class="nav tabs-vertical">
+        <li class="<%= @category.blank? ? 'active' : '' %>">
+          <%= link_to "All", prices_path, style: "text-align:left;" %>
+        </li>
         <% @categories.each do |ct| %>
-          <li class="<%= ct == @category ? 'active' : '' %>">
-            <%= link_to ct.name, prices_path(ct: ct.id) %>
+          <li class="<%= @category && @category == ct ? 'active' : '' %>">
+            <%= link_to ct.name, prices_path(ct: ct.id), style: "text-align:left;" %>
           </li>
         <% end %>        
+        <li class="<%= @category && @category.id == -1 ? 'active' : '' %>">
+          <%= link_to "None", prices_path(ct: -1), style: "text-align:left;" %>
+        </li>
       </ul>
 
       <!-- <ul class="nav nav-tabs nav-tabs-justified">

data/app/views/layouts/kuppayam/_sidebar.html.erb

@@ -137,7 +137,7 @@
 		<header class="logo-env">
 			<!-- logo -->
 			<div class="logo">
-				<a href="/" class="logo-expanded"><img src="/assets/logo.png" width="180" alt="" /></a>
+				<a href="/" class="logo-expanded"><img src="/assets/logo-white.png" width="180" alt="" /></a>
 				<a href="/" class="logo-collapsed"><img src="/assets/logo-small.png" width="40" alt="" /></a>
 			</div>
 			

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,7 +147,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.17
+        version: 0.3.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.17
+        version: 0.3.18
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement