my_admin 0.0.7 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- Zjk4Zjk4YWMzZDQ4ZTM3NmZmZDEzNDBkMjgxODM3ZTdhZTg2NTQwMA==
4
+ MDkxNDIwY2Y0NGFiMTljOGNkNmU1MGMwYjkwOTQ2Y2U3ZGMxNTQyOA==
5
5
  data.tar.gz: !binary |-
6
- ZWU3NWZiN2YyYmUwNDk3Yzg4ZWUyOGFiZTQ3ZDJiNmRiYzc1N2EwYg==
6
+ OWI3YzE1ZTViOTQwNjJmNmRjMmI4NDMwNzE4MmYyMzdhN2Y0MWI2ZQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZTZkYWY0NTA2NDMyODE4MDE1MDIyNTllMjgxYmJhMDdkZjdmYWM4MmUzZDdi
10
- YmI1NmE4YmI2MThkZWU1NmJkM2FkNDY3MTUwOGM2ZTllMmNlNjkzNjc3MTYx
11
- N2M3ZTFkYzUwNDU5ZGVmNTFhNGM5MzVkN2RiMzMyY2E2OTQ5Yzc=
9
+ ODM3MTVmY2Q4YzM5ZWRlN2EzMzY2MmEzNWViNTY2ZDZmNjAwOTJkZDM0N2Rj
10
+ NjBmMmVkMWYwY2I4ODA1NGM2NzVjNTY4NGRiZjRlMjljYjlkNzQ1ZmI3NzY3
11
+ ZjMzNWU1ODg3ZmZkNTYxNzdhZGFkYjU4Mjc4MzRlY2JjOGFhM2E=
12
12
  data.tar.gz: !binary |-
13
- MmY1N2RhOGMwYzc4YWFmZDZkZTUzNGJmMmIxY2VlMzQ4MGM1N2NmNTg3ZDU1
14
- NGFkYjM4Y2I3YjAxZDA0YmJkYjI5NmU5MDE2ZTZkODY5YzkzODcwMzc0YTgz
15
- ZWU5YmEwNTUzNGExYmVkZGQyZjdiMmFkN2I2YWY3MWNhNWJjNDU=
13
+ NGQ5MGNlYmY1OTI5OWFhOGNmMTRjOTc5ODhmYjExMmQ5MWFhOGMzMmQwZjQw
14
+ MjBkYWRmYjM4OWE1ZjhhNGY4MTE0MmNhZDE0Mjg3NDYzMjFmNzYxMmI2ZjM5
15
+ MDQ3ODhlN2ZjYWMzN2ZjYjBlYjA2MjA1MTUwNDc5ZGQyM2IwNzc=
@@ -14,6 +14,12 @@ class MyAdmin::ModelsController < MyAdmin::MyAdminController
14
14
  @objects = @model.order("#{@model.table_name}.#{@model.primary_key} desc")
15
15
  end
16
16
 
17
+ if not @model.my_admin.filters.blank? and not params[@model.underscore].blank?
18
+ @model.my_admin.filters.each do |field|
19
+ @objects = filter_filter(@application, @model, field, @objects)
20
+ end
21
+ end
22
+
17
23
  headers = []
18
24
  only = @model.my_admin.export_display
19
25
 
@@ -12,8 +12,10 @@ class MyAdmin::Permission < ActiveRecord::Base
12
12
  application.title + ">" + self.model.constantize.title + " - " + I18n.t("my_admin.permissions.#{self.name}")
13
13
  end
14
14
 
15
- scope :by_user, lambda { |user_id|
16
- { :joins => {:groups => [:users]}, :conditions => {"my_admin_users.id" => user_id} }
17
- }
15
+ scope :by_user, ->(user_id){ joins({:groups => [:users]).where("my_admin_users.id" => user_id) }
16
+
17
+ # scope :by_user, lambda { |user_id|
18
+ # { :joins => {:groups => [:users]}, :conditions => {"my_admin_users.id" => user_id} }
19
+ # }
18
20
 
19
21
  end
@@ -49,13 +49,22 @@ class MyAdmin::User < ActiveRecord::Base
49
49
  :password => {:type => :password},
50
50
  :password_confirmation => {:type => :password}}
51
51
  end
52
- scope :my_admin_order_full_name, lambda { |params|
53
- { :order => "first_name #{params[:order]}, last_name #{params[:order]}" } if params[:order].present?
52
+
53
+ scope :my_admin_order_full_name, ->(params){
54
+ order("first_name #{params[:order]}, last_name #{params[:order]}") if params[:order].present?
54
55
  }
55
-
56
- scope :my_admin_filter_full_name, lambda { |params|
57
- { :conditions => ["concat_ws(' ',first_name,last_name) like ?", "%#{params[:full_name]}%"] } if params[:full_name].present?
56
+
57
+ scope :my_admin_filter_full_name, ->(params){
58
+ where("concat_ws(' ',first_name,last_name) like ?", "%#{params[:full_name]}%") if params[:full_name].present?
58
59
  }
60
+
61
+ # scope :my_admin_order_full_name, lambda { |params|
62
+ # { :order => "first_name #{params[:order]}, last_name #{params[:order]}" } if params[:order].present?
63
+ # }
64
+
65
+ # scope :my_admin_filter_full_name, lambda { |params|
66
+ # { :conditions => ["concat_ws(' ',first_name,last_name) like ?", "%#{params[:full_name]}%"] } if params[:full_name].present?
67
+ # }
59
68
 
60
69
  def permissions
61
70
  @permissions ||= MyAdmin::Permission.by_user(self.id)
@@ -25,7 +25,7 @@
25
25
  <%#= I18n.t('my_admin.titles.models.new', :model => @model.title) %>
26
26
  <% end if @model.my_admin.can?(:create, my_admin_user) %>
27
27
 
28
- <%= link_to(collection_model_link(@application, @model, :export), :class => "btn btn-inverse") do %>
28
+ <%= link_to(collection_model_link(@application, @model, :export, params.clone), :class => "btn btn-inverse") do %>
29
29
  <i class="glyphicon-file_export"></i>
30
30
  <%= I18n.t('my_admin.titles.models.export', :model => @model.title) %>
31
31
  <% end if @model.my_admin.can?(:export, my_admin_user) %>
@@ -1,3 +1,3 @@
1
1
  module MyAdmin
2
- VERSION = "0.0.7"
2
+ VERSION = "0.0.8"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: my_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marcos Vinicius von Gal dos Santos
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-30 00:00:00.000000000 Z
11
+ date: 2015-12-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails