zutils 1.1.0 → 2.0.0

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,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8be8be9b23d0b07e71f9220bd0e9f82307dd0f7773131b3c1311b89c51b7c85b
4
- data.tar.gz: 7bebbfaa4e9d73d00481114102dbce38a3133c271d973a0609f6682c8a19a9e1
3
+ metadata.gz: 3630171997e63501bdef72428599e01e8433f2561e1d11a9a2f2a758bfd3447a
4
+ data.tar.gz: '08c18d2315835db0721b546e96254d7b51f2c2a081ab8350b4dd921898267b68'
5
5
  SHA512:
6
- metadata.gz: 0f4f46044490cd2ed3b086e6e8aaeb69c34cf4ac9aa0fe17c35c94e621164321e6e038385fc0e8c03148892bc0c46d62e60dda3bcadde8156d617a059efe288c
7
- data.tar.gz: 2530d2dfaf3104c1c27eb2ec5984e899f4cecdc991f4b51f8a84602274c4833ab1f6c65a64dc07ef782648b11c2fa210d3f490afdb01b513712efb159dc17f3b
6
+ metadata.gz: fb84011a96b37188a7c913fad32ed75d882f3bb405e455180f94bc8eb4e058973c6dbd0a2dceca08fb13a0fd1d737016bf25212948a24763f23171d3ec45b077
7
+ data.tar.gz: 71515648e16702b2b737a4c43787637d21c1d79e411284280f9caac1fde5c2540bbcf9e43d7858d02425d247f0ccf7da9c83d70b5e1831db26c4ca99cecbbb74
@@ -17,6 +17,7 @@
17
17
  <% hide_footer ||= false %>
18
18
 
19
19
  <% hide_read_action ||= false %>
20
+ <% hide_new_action ||= false %>
20
21
  <% hide_edit_action ||= false %>
21
22
  <% hide_destroy_action ||= false %>
22
23
 
@@ -68,7 +69,7 @@
68
69
  <% unless hide_links %>
69
70
  <% unless controller_name == 'users' %>
70
71
  <div class="box-footer card-footer">
71
- <% if can? :new, list.klass %>
72
+ <% if !hide_new_action && can? :new, list.klass %>
72
73
  <% if nested_resource == true %>
73
74
  <% if parent_resource %>
74
75
  <%= link_to eval("new_#{parent_resource.class.model_name.singular}_#{list.klass.model_name.singular}_path(#{parent_resource.id})"), class: "btn btn-#{box_class}" do %>
@@ -39,9 +39,11 @@
39
39
  <th data-field="<%= column_method || column_name %>" data-align="<%= column_align %>">
40
40
  <% if sort_all || sort_fields.include?(column_name) %>
41
41
  <% if column_name.include?('.') %>
42
- <% s_name = column_method || column_name %>
43
- <%= sort_link(@q, s_name.split('.').join('_'),
44
- "#{s_name.split('.')[-2]&.camelize} (#{s_name.split('.')[-1]})")
42
+ <% mname = column_name.split('.')[-2]&.camelize %>
43
+ <% cname = column_name.split('.')[-1] %>
44
+ <% model = Kernel.const_get(mname) %>
45
+ <%= sort_link(@q, column_name.split('.').join('_'),
46
+ "#{model.model_name.human} (#{model.human_attribute_name(cname)})")
45
47
  %>
46
48
  <% elsif /_id$/ =~ column_name %>
47
49
  <%= sort_link(@q, column_name, list.klass.human_attribute_name(column_name.split("_id")[0])) %>
@@ -92,9 +94,13 @@
92
94
 
93
95
  <td>
94
96
  <% if column_name.include?('.') %>
95
- <% o = object %>
96
- <% column_name.split('.').each{|m| o = o.send(m) if o } %>
97
- <%= o %>
97
+ <% if column_method.nil? %>
98
+ <% o = object %>
99
+ <% column_name.split('.').each{|m| o = o.send(m) if o } %>
100
+ <%= o %>
101
+ <% else %>
102
+ <%= object.send(column_method) %>
103
+ <% end %>
98
104
  <% elsif object.send(column_name).class == Date or
99
105
  object.send(column_name).class == DateTime or
100
106
  object.send(column_name).class == ActiveSupport::TimeWithZone or
@@ -34,15 +34,25 @@
34
34
  <% end %>
35
35
  <% end %>
36
36
  <% if show_actions.include?('edit') && can?(:edit, object) %>
37
- <%= link_to eval_with_rescue("edit_#{object.class.model_name.singular}_path(#{object.id})"), class: "btn btn-warning btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
38
- Editar <i class="fa fa-pencil"></i>
37
+ <% if nested_resource %>
38
+ <%= link_to eval_with_rescue("edit_#{parent_resource.class.model_name.singular}_#{object.class.model_name.singular}_path(#{parent_resource.id},#{object.id})"), class: "btn btn-#{box_class} btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
39
+ Editar <i class="fa fa-pencil fa-pen"></i>
40
+ <% end %>
41
+ <% else %>
42
+ <%= link_to eval_with_rescue("edit_#{object.class.model_name.singular}_path(#{object.id})"), class: "btn btn-warning btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
43
+ Editar <i class="fa fa-pencil fa-pen"></i>
44
+ <% end %>
39
45
  <% end %>
40
46
  <% end %>
41
47
  <% if show_actions.include?('index') %>
42
48
  <% if nested_resource %>
43
- <%= link_to 'Listagem', eval_with_rescue("#{parent_resource.class.model_name.singular}_#{object.class.model_name.plural}_path(#{parent_resource.id})"), class: "btn btn-default btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Listagem' } %>
49
+ <%= link_to eval_with_rescue("#{parent_resource.class.model_name.singular}_#{object.class.model_name.plural}_path(#{parent_resource.id})"), class: "btn btn-default btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Listagem' } do %>
50
+ Listagem <i class="fa fa-bars"></i>
51
+ <% end %>
44
52
  <% else %>
45
- <%= link_to 'Listagem', eval_with_rescue("#{object.class.model_name.plural}_path"), class: "btn btn-default btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Listagem' } %>
53
+ <%= link_to eval_with_rescue("#{object.class.model_name.plural}_path"), class: "btn btn-default btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Listagem' } do %>
54
+ Listagem <i class="fa fa-bars"></i>
55
+ <% end %>
46
56
  <% end %>
47
57
  <% end %>
48
58
  <% end %>
@@ -161,7 +171,7 @@
161
171
  </table>
162
172
  </div>
163
173
  </div>
164
- <% else %>
174
+ <% else %>
165
175
  <div class="box box-<%= box_class %>">
166
176
  <div class="box-header with-border">
167
177
  <h3 class="box-title">
@@ -1,3 +1,3 @@
1
1
  module Zutils
2
- VERSION = "1.1.0"
2
+ VERSION = "2.0.0"
3
3
  end
data/zutils.gemspec CHANGED
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
32
32
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
33
33
  spec.require_paths = ["lib"]
34
34
 
35
- spec.add_dependency 'rails', '~> 6.0'
35
+ spec.add_dependency 'rails', '>= 5.0'
36
36
 
37
37
  spec.add_development_dependency "bundler", "~> 1.16"
38
38
  spec.add_development_dependency "rake", "~> 10.0"
metadata CHANGED
@@ -1,29 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zutils
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ricardo Viana
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-03-26 00:00:00.000000000 Z
11
+ date: 2022-06-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '6.0'
19
+ version: '5.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: '6.0'
26
+ version: '5.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bundler
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
100
100
  - !ruby/object:Gem::Version
101
101
  version: '0'
102
102
  requirements: []
103
- rubygems_version: 3.0.3
103
+ rubygems_version: 3.3.7
104
104
  signing_key:
105
105
  specification_version: 4
106
106
  summary: Utilidades gerais para aplicações rails