redmine_extensions 0.1.18 → 0.1.19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/generators/redmine_extensions/entity/templates/en.yml.erb +1 -0
  3. data/lib/generators/redmine_extensions/entity/templates/query.rb.erb +7 -2
  4. data/lib/generators/redmine_extensions/entity/templates/show.html.erb.erb +39 -37
  5. data/lib/generators/redmine_extensions/plugin/templates/en.yml.erb +2 -1
  6. data/lib/redmine_extensions/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a639d231072a4c7f8380ac6bf54869a0d6856fef
4
- data.tar.gz: 10effaf0e54406293828dea6a89090f3257716db
3
+ metadata.gz: 0ba48bfb93ec67f9d2f85ebf393380bb394314bd
4
+ data.tar.gz: fc1fbaf825cc44a9c74172db84450f0b39b899f4
5
5
  SHA512:
6
- metadata.gz: 5ddf378590cd27b485875f39e287030317d79838713bc0b8e10856395da67a95662eb3d92d0f12b72178ce5ac0b6709704253d9660d2a98974c4dc23b104cb0d
7
- data.tar.gz: 57bb961b520971c5909a330e29bb0dc69e73beb2d8b91c2007133455ea94cecb83a2c3fd26526651014aa4cbd7e46f43df3e93d2756fbcab5073bcf6b049daae
6
+ metadata.gz: 0b1f66f89cd8442752219382fa0f6d26dc132fe61d149d1a34a7540a2e830cab44c3f491056508cf327857d7dce6831cca41685e1dad14a1225846b21570a95c
7
+ data.tar.gz: 10a8b490f51e89f8eb8a362a8fe46fa0dac25d64d214790f47919f6154aa0dddd6dfaf22af2cae97de370e71352bbf0312c6d596208192a7df1eba3d711e0e6c
data/lib/generators/redmine_extensions/entity/templates/en.yml.erb CHANGED
@@ -13,3 +13,4 @@ en:
13
13
  permission_view_<%= model_name_pluralize_underscored %>: View <%= model_name_pluralize_underscored.titleize %>
14
14
  permission_manage_<%= model_name_pluralize_underscored %>: Manage <%= model_name_pluralize_underscored.titleize %>
15
15
  title_<%= model_name_underscored %>_new: Click to create new <%= model_name_underscored.titleize %>
16
+ label_filter_group_<%= model_name_underscored %>_query: <%= model_name %>
data/lib/generators/redmine_extensions/entity/templates/query.rb.erb CHANGED
@@ -20,12 +20,17 @@ class <%= model_name %>Query < EasyQuery
20
20
 
21
21
  def available_columns
22
22
  return @available_columns if @available_columns
23
+ group = l("label_filter_group_#{self.class.name.underscore}")
23
24
 
24
25
  <%- db_columns.each do |column_name, column_options| -%>
25
- add_available_column '<%= column_options[:query_column_name] || column_name %>', caption: ::<%= model_name %>.human_attribute_name(:<%= column_name %>), title: ::<%= model_name %>.human_attribute_name(:<%= column_name %>)
26
+ add_available_column '<%= column_options[:query_column_name] || column_name %>', caption: ::<%= model_name %>.human_attribute_name(:<%= column_name %>), title: ::<%= model_name %>.human_attribute_name(:<%= column_name %>), group: group
26
27
  <%- end -%>
27
28
  <%- if acts_as_customizable? -%>
28
- @available_columns += <%= model_name %>CustomField.visible.collect { |cf| EasyQueryCustomFieldColumn.new(cf, :group => default_cf_group) }
29
+ <% if Redmine::Plugin.installed?(:easy_extensions) %>
30
+ @available_columns += <%= model_name %>CustomField.visible.collect { |cf| EasyQueryCustomFieldColumn.new(cf, :group => l(:label_filter_group_custom_fields)) }
31
+ <% else %>
32
+ @available_columns += <%= model_name %>CustomField.visible.collect { |cf| QueryCustomFieldColumn.new(cf) }
33
+ <%- end -%>
29
34
  <%- end -%>
30
35
 
31
36
  @available_columns
data/lib/generators/redmine_extensions/entity/templates/show.html.erb.erb CHANGED
@@ -1,38 +1,40 @@
1
- <%%= title @<%= model_name_underscored %> %>
2
- <div class="issue">
3
- <table class="attributes">
4
- <%%= issue_fields_rows do |rows| %>
5
- <%- safe_columns.each_with_index do |column, idx| -%>
6
- <%- next if description_column? && column[0] == description_column -%>
7
- <%- if idx % 2 == 0 -%>
8
- <%% rows.left ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
9
- <%- else -%>
10
- <%% rows.right ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
11
- <%- end -%>
12
- <%- end -%>
13
- <%% end %>
14
- <%%= render_custom_fields_rows(@<%= model_name_underscored %>) %>
15
- <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_show_details_bottom, :<%= model_name_underscored %> => @<%= model_name_underscored %>) %>
16
- </table>
17
- <%- if description_column? -%>
18
- <%% if !@<%= model_name_underscored %>.<%= description_column %>.blank? %>
19
- <hr />
20
- <div class="description">
21
- <p><strong><%%= ::<%= model_name %>.human_attribute_name(:<%= description_column %>) %></strong></p>
22
- <div class="wiki">
23
- <%%= textilizable @<%= model_name_underscored %>, :<%= description_column %>, attachments: @<%= model_name_underscored %>.attachments %>
24
- </div>
25
- </div>
26
- <%% end %>
27
- <%- end -%>
28
- <%- if acts_as_attachable? -%>
29
- <%% if @<%= model_name_underscored %>.attachments.any? -%>
30
- <hr />
31
- <%%= link_to_attachments @<%= model_name_underscored %>, :thumbnails => true %>
32
- <%% end %>
33
- <%- end -%>
34
- </div>
35
- <%% ### PAGE CUSTOMS ########################################################## %>
36
- <%% content_for :sidebar do %>
37
- <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
1
+ <%%= title @<%= model_name_underscored %> %>
2
+ <div class="issue">
3
+ <table class="attributes">
4
+ <%%= issue_fields_rows do |rows| %>
5
+ <%- safe_columns.each_with_index do |column, idx| -%>
6
+ <%- next if description_column? && column[0] == description_column -%>
7
+ <%- if idx % 2 == 0 -%>
8
+ <%% rows.left ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
9
+ <%- else -%>
10
+ <%% rows.right ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
11
+ <%- end -%>
12
+ <%- end -%>
13
+ <%% end %>
14
+ <%- if acts_as_customizable? -%>
15
+ <%%= render_custom_fields_rows(@<%= model_name_underscored %>) %>
16
+ <%- end -%>
17
+ <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_show_details_bottom, :<%= model_name_underscored %> => @<%= model_name_underscored %>) %>
18
+ </table>
19
+ <%- if description_column? -%>
20
+ <%% if !@<%= model_name_underscored %>.<%= description_column %>.blank? %>
21
+ <hr />
22
+ <div class="description">
23
+ <p><strong><%%= ::<%= model_name %>.human_attribute_name(:<%= description_column %>) %></strong></p>
24
+ <div class="wiki">
25
+ <%%= textilizable @<%= model_name_underscored %>, :<%= description_column %>, attachments: @<%= model_name_underscored %>.attachments %>
26
+ </div>
27
+ </div>
28
+ <%% end %>
29
+ <%- end -%>
30
+ <%- if acts_as_attachable? -%>
31
+ <%% if @<%= model_name_underscored %>.attachments.any? -%>
32
+ <hr />
33
+ <%%= link_to_attachments @<%= model_name_underscored %>, :thumbnails => true %>
34
+ <%% end %>
35
+ <%- end -%>
36
+ </div>
37
+ <%% ### PAGE CUSTOMS ########################################################## %>
38
+ <%% content_for :sidebar do %>
39
+ <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
38
40
  <%% end %>
data/lib/generators/redmine_extensions/plugin/templates/en.yml.erb CHANGED
@@ -1,2 +1,3 @@
1
1
  en:
2
- label: Hello
2
+ label: Hello
3
+ label_filter_group_custom_fields: Custom fields
data/lib/redmine_extensions/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RedmineExtensions
2
- VERSION = '0.1.18'
2
+ VERSION = '0.1.19'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redmine_extensions
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.18
4
+ version: 0.1.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Easy Software Ltd
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-17 00:00:00.000000000 Z
11
+ date: 2017-02-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails