my_admin 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjk4Zjk4YWMzZDQ4ZTM3NmZmZDEzNDBkMjgxODM3ZTdhZTg2NTQwMA==
+    MDkxNDIwY2Y0NGFiMTljOGNkNmU1MGMwYjkwOTQ2Y2U3ZGMxNTQyOA==
   data.tar.gz: !binary |-
-    ZWU3NWZiN2YyYmUwNDk3Yzg4ZWUyOGFiZTQ3ZDJiNmRiYzc1N2EwYg==
+    OWI3YzE1ZTViOTQwNjJmNmRjMmI4NDMwNzE4MmYyMzdhN2Y0MWI2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTZkYWY0NTA2NDMyODE4MDE1MDIyNTllMjgxYmJhMDdkZjdmYWM4MmUzZDdi
-    YmI1NmE4YmI2MThkZWU1NmJkM2FkNDY3MTUwOGM2ZTllMmNlNjkzNjc3MTYx
-    N2M3ZTFkYzUwNDU5ZGVmNTFhNGM5MzVkN2RiMzMyY2E2OTQ5Yzc=
+    ODM3MTVmY2Q4YzM5ZWRlN2EzMzY2MmEzNWViNTY2ZDZmNjAwOTJkZDM0N2Rj
+    NjBmMmVkMWYwY2I4ODA1NGM2NzVjNTY4NGRiZjRlMjljYjlkNzQ1ZmI3NzY3
+    ZjMzNWU1ODg3ZmZkNTYxNzdhZGFkYjU4Mjc4MzRlY2JjOGFhM2E=
   data.tar.gz: !binary |-
-    MmY1N2RhOGMwYzc4YWFmZDZkZTUzNGJmMmIxY2VlMzQ4MGM1N2NmNTg3ZDU1
-    NGFkYjM4Y2I3YjAxZDA0YmJkYjI5NmU5MDE2ZTZkODY5YzkzODcwMzc0YTgz
-    ZWU5YmEwNTUzNGExYmVkZGQyZjdiMmFkN2I2YWY3MWNhNWJjNDU=
+    NGQ5MGNlYmY1OTI5OWFhOGNmMTRjOTc5ODhmYjExMmQ5MWFhOGMzMmQwZjQw
+    MjBkYWRmYjM4OWE1ZjhhNGY4MTE0MmNhZDE0Mjg3NDYzMjFmNzYxMmI2ZjM5
+    MDQ3ODhlN2ZjYWMzN2ZjYjBlYjA2MjA1MTUwNDc5ZGQyM2IwNzc=

data/app/controllers/my_admin/models_controller.rb

@@ -14,6 +14,12 @@ class MyAdmin::ModelsController < MyAdmin::MyAdminController
         @objects = @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)
+        end
+      end
+
       headers = []
       only = @model.my_admin.export_display
   

data/app/model/my_admin/permission.rb

@@ -12,8 +12,10 @@ class MyAdmin::Permission < ActiveRecord::Base
     application.title + ">" + self.model.constantize.title + " - " + I18n.t("my_admin.permissions.#{self.name}") 
   end
   
-  scope :by_user, lambda { |user_id|
-    { :joins => {:groups => [:users]}, :conditions => {"my_admin_users.id" => user_id} }
-  }
+  scope :by_user, ->(user_id){ joins({:groups => [:users]).where("my_admin_users.id" => user_id) }
+
+  # scope :by_user, lambda { |user_id|
+    # { :joins => {:groups => [:users]}, :conditions => {"my_admin_users.id" => user_id} }
+  # }
   
 end

data/app/model/my_admin/user.rb

@@ -49,13 +49,22 @@ class MyAdmin::User < ActiveRecord::Base
                     :password => {:type => :password}, 
                     :password_confirmation => {:type => :password}}
   end
-  scope :my_admin_order_full_name, lambda { |params|
-    { :order => "first_name #{params[:order]}, last_name #{params[:order]}" } if params[:order].present?
+
+  scope :my_admin_order_full_name, ->(params){ 
+    order("first_name #{params[:order]}, last_name #{params[:order]}") if params[:order].present?
   }
-  
-  scope :my_admin_filter_full_name, lambda { |params|
-    { :conditions => ["concat_ws(' ',first_name,last_name) like ?", "%#{params[:full_name]}%"] } if params[:full_name].present?
+
+  scope :my_admin_filter_full_name, ->(params){ 
+    where("concat_ws(' ',first_name,last_name) like ?", "%#{params[:full_name]}%") if params[:full_name].present?
   }
+
+  # scope :my_admin_order_full_name, lambda { |params|
+  #   { :order => "first_name #{params[:order]}, last_name #{params[:order]}" } if params[:order].present?
+  # }
+  
+  # scope :my_admin_filter_full_name, lambda { |params|
+  #   { :conditions => ["concat_ws(' ',first_name,last_name) like ?", "%#{params[:full_name]}%"] } if params[:full_name].present?
+  # }
   
   def permissions
     @permissions ||= MyAdmin::Permission.by_user(self.id)

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

@@ -25,7 +25,7 @@
 							<%#= I18n.t('my_admin.titles.models.new', :model => @model.title) %>
 						<% end if @model.my_admin.can?(:create, my_admin_user) %>
 
-				    <%= link_to(collection_model_link(@application, @model, :export), :class => "btn btn-inverse") do %>
+				    <%= link_to(collection_model_link(@application, @model, :export, params.clone), :class => "btn btn-inverse") do %>
 							<i class="glyphicon-file_export"></i>
 							<%= I18n.t('my_admin.titles.models.export', :model => @model.title) %>
 						<% end if @model.my_admin.can?(:export, my_admin_user) %>

data/lib/my_admin/version.rb

@@ -1,3 +1,3 @@
 module MyAdmin
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Marcos Vinicius von Gal dos Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails