my_admin 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2efa8d0cafd36435d4b6997940e9db0b22ad05
-  data.tar.gz: 82799c3b139d3fbea88a06c733d3073cf50fb6bf
+  metadata.gz: fcd68a7e9716e15df35d850eaebfc2a12bdb9436
+  data.tar.gz: 3c919a4febd16e6fefc8775518e88b34767514da
 SHA512:
-  metadata.gz: 74bcbb6322e3a28e4094b07b6271113dcbff7aa475c676e287917aae04012040185a4c0f3575d8a71ea8731b1da59cb647c4215db89656b62e52beadde60d979
-  data.tar.gz: 06a3b397445bd69963a62ca939ff4eb4dab48dec1aac6bb0b167fa0ad1afbce729179f70b926581ea1b49c686419e74614200a96fa3f567231dca428c752a1d4
+  metadata.gz: 466081411ceb304451bb2c3148049a79780b29b913474f6c1cf6833cf21539d9470b61a3947f54bafc65a77564d0256d26105c1c2c3c68ef7b9005add044f47d
+  data.tar.gz: 05095bc9dd6926e559395ac8efd298e9af10a1ce9021c7630084073f332f0536cd9f28e93141e830360f748426f1053386a4c5d3bfdbee55d47ae40fbab1d9ae

data/app/controllers/my_admin/models_controller.rb

@@ -39,25 +39,25 @@ class MyAdmin::ModelsController < MyAdmin::MyAdminController
       
       unless params[:order_by].blank?
         if @model.respond_to? "my_admin_order_#{params[:order_by]}"
-          @objects = @model.send("my_admin_order_#{params[:order_by]}", params)
+          @objects_all = @model.send("my_admin_order_#{params[:order_by]}", params)
         else
-          @objects = @model.my_admin_order(params)
+          @objects_all = @model.my_admin_order(params)
         end
       else
-        @objects = @model.order("#{@model.table_name}.#{@model.primary_key} desc")
+        @objects_all = @model.order("#{@model.table_name}.#{@model.primary_key} desc")
       end
       
       if not @model.my_admin.filters.blank? and not params[@model.underscore].blank?
         @model.my_admin.filters.each do |field|
-          @objects = filter_filter(@application, @model, field, @objects)
+          @objects_all = filter_filter(@application, @model, field, @objects_all)
         end
       end
 
       per_page = params[:per_page] || @model.my_admin.per_page
       per_page = @model.my_admin.per_page if params[:per_page].to_i <= 0 rescue @model.my_admin.per_page
       
-      @objects = @objects.my_admin_default_scope if @objects.respond_to? :my_admin_default_scope
-      @objects = @objects.paginate(:per_page => per_page, :page => params[:page])
+      @objects_all = @objects_all.my_admin_default_scope if @objects_all.respond_to? :my_admin_default_scope
+      @objects = @objects_all.paginate(:per_page => per_page, :page => params[:page])
       
       cache_my_admin_params
       render_model_template

data/app/views/layouts/my_admin.html.erb

@@ -47,7 +47,7 @@
 			<%= render "my_admin/left" %>
 			<div id="main">
 				<div class="container-fluid">
-					<<div class="page-header">
+					<div class="page-header">
 						<div class="pull-left">
 							<h1><%= yield(:title) %></h1>
 						</div>

data/app/views/my_admin/models/index.html.erb

@@ -1,5 +1,9 @@
 <% content_for :title do %>Lista de <%= @model.title_plural %><% end %>
 
+<% content_for :stats do %>
+  <%= render model_template(@application, @model, 'stats') %>
+<% end %>
+
 <%= render model_template(@application, @model, 'filters'), { :url => model_link(@application, @model) } %>
 	
 <div class="row-fluid">	

data/lib/my_admin/active_record.rb

@@ -73,7 +73,7 @@ module MyAdmin
             condition += "#{model.table_name}.#{field} <= :date_to"
           end
 
-          where(condition, { :date_from => ( params[field_name_from].to_datetime.beginning_of_day rescue nil ), :date_to => ( params[field_name_to].to_datetime.end_of_day rescue nil ) })
+          where(condition, { :date_from => ( params[field_name_from].to_time.beginning_of_day rescue nil ), :date_to => ( params[field_name_to].to_time.end_of_day rescue nil ) })
         end
 
 

data/lib/my_admin/version.rb

@@ -1,3 +1,3 @@
 module MyAdmin
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Marcos Vinicius von Gal dos Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -909,6 +909,7 @@ files:
 - app/views/my_admin/models/_form.html.erb
 - app/views/my_admin/models/_paginate.html.erb
 - app/views/my_admin/models/_popup_hint.html.erb
+- app/views/my_admin/models/_stats.html.erb
 - app/views/my_admin/models/edit.html.erb
 - app/views/my_admin/models/index.html.erb
 - app/views/my_admin/models/new.html.erb