项目

一般

简介

可以对Redmine问题/issue自定义字段分组和调整显示顺序的补丁 » GCF-4.1.patch

Chen Snowman, 2020-10-15 18:12

查看差别:

app/controllers/projects_controller.rb
194 194
    @version_status = params[:version_status] || 'open'
195 195
    @version_name = params[:version_name]
196 196
    @versions = @project.shared_versions.status(@version_status).like(@version_name).sorted
197
    @cfs=AttributeGroup.joins(:custom_fields).joins(:tracker).
198
      where(project_id: @project, tracker_id: @trackers, :custom_fields => {id: @project.all_issue_custom_fields.pluck(:id)}).
199
      pluck("trackers.id", "id", "name", "position","attribute_group_fields.id", "attribute_group_fields.position",
200
            "custom_fields.id", "custom_fields.name", "custom_fields.position").sort_by{|x| [x[3], x[5]]}
197 201
  end
198 202

  
199 203
  def edit
......
220 224
    end
221 225
  end
222 226

  
227
  def groupissuescustomfields
228
    # clean invalid values: invalid cfs, empty cf lists, empty groups
229
    group_issues_custom_fields = (JSON.parse params[:group_issues_custom_fields]).
230
      each{|tid,v| v.replace(v.select{|k,v| v["cfs"] ? v["cfs"].delete_if{|k,v| @project.all_issue_custom_fields.pluck(:id).include?(v)} : v})}.
231
      each{|tid,v| v.delete_if{|k,v| v["cfs"].blank?}}.
232
      delete_if{|k,v| v.blank?}
233

  
234
    groups = AttributeGroup.where(project_id: @project.id).collect(&:id)
235
    fields = AttributeGroupField.where(attribute_group_id: groups).collect(&:id) 
236
    group_issues_custom_fields.each do |tid,v|
237
      v.each do |gp, g|
238
        gid = groups.shift
239
        if gid.nil?
240
          gid=AttributeGroup.create(project_id: @project.id, tracker_id: tid, name: g["name"].nil? ? nil : g["name"], position: gp).id
241
        else
242
          AttributeGroup.update(gid, project_id: @project.id, tracker_id: tid, name: g["name"].nil? ? nil : g["name"], position: gp)
243
        end
244
        g['cfs'].each do |cfp, cf|
245
          cfid = fields.shift
246
          if cfid.nil?
247
            AttributeGroupField.create(attribute_group_id: gid, custom_field_id: cf, position: cfp)
248
          else
249
            AttributeGroupField.update(cfid, attribute_group_id: gid, custom_field_id: cf, position: cfp)
250
          end
251
        end
252
      end
253
    end
254
    AttributeGroupField.where(id: fields).delete_all
255
    AttributeGroup.where(id: groups).destroy_all
256
    flash[:notice] = l(:notice_successful_update)
257
    redirect_to settings_project_path(@project, :tab => 'groupissuescustomfields')
258
  end
259

  
223 260
  def archive
224 261
    unless @project.archive
225 262
      flash[:error] = l(:error_can_not_archive_project)
app/helpers/issues_helper.rb
300 300
    r.to_html
301 301
  end
302 302

  
303
  def render_half_width_custom_fields_rows(issue)
304
    values = issue.visible_custom_field_values.reject {|value| value.custom_field.full_width_layout?}
305
    return if values.empty?
306
    half = (values.size / 2.0).ceil
307
    issue_fields_rows do |rows|
308
      values.each_with_index do |value, i|
309
        m = (i < half ? :left : :right)
310
        rows.send m, custom_field_name_tag(value.custom_field), custom_field_value_tag(value), :class => value.custom_field.css_classes
311
      end
312
    end
303
  def group_by_keys(project_id, tracker_id, custom_field_values)
304
    keys_grouped = AttributeGroupField.joins(:attribute_group).
305
      where(:attribute_groups => {project_id: project_id, tracker_id: tracker_id}).
306
      order("attribute_groups.position", :position).pluck(:name, :custom_field_id).group_by(&:shift)
307
    custom_fields_grouped = { nil => (keys_grouped[nil].nil? ? [] : keys_grouped[nil].map{|n| custom_field_values.select{|x| x.custom_field[:id] == n[0]}}.flatten) |
308
      custom_field_values.select{|y| ! keys_grouped.values.flatten.include?(y.custom_field[:id])}}
309
    keys_grouped.reject{|k,v| k == nil}.each{|k,v| custom_fields_grouped[k] = v.map{|n| custom_field_values.select{|x| x.custom_field[:id] == n[0]}}.flatten}
310
    custom_fields_grouped
313 311
  end
314 312

  
315
  def render_full_width_custom_fields_rows(issue)
316
    values = issue.visible_custom_field_values.select {|value| value.custom_field.full_width_layout?}
317
    return if values.empty?
313
  def render_custom_fields_rows(issue)
318 314
    s = ''.html_safe
319
    values.each_with_index do |value, i|
320
      attr_value_tag = custom_field_value_tag(value)
321
      next if attr_value_tag.blank?
315
    group_by_keys(issue.project_id, issue.tracker_id, issue.visible_custom_field_values).each do |title, values|
316
      if values.present?
317
        s += content_tag('h4', title, :style => 'background: #0001; padding: 0.3em;') unless title.nil?
318
        while values.present?
319
          unless values[0].custom_field.full_width_layout?
320
            lr_values = []
321
            while values.present? && ! values[0].custom_field.full_width_layout?
322
              lr_values += [ values.shift ]
323
            end
324
            half = (lr_values.size / 2.0).ceil
325
            s += issue_fields_rows do |rows|
326
              lr_values.each_with_index do |value, i|
327
                m = (i < half ? :left : :right)
328
                rows.send m, custom_field_name_tag(value.custom_field), custom_field_value_tag(value), :class => value.custom_field.css_classes
329
              end
330
            end
331
          else
332
            while values.present? && values[0].custom_field.full_width_layout?
333
              value=values.shift
334
              content = content_tag('div', custom_field_name_tag(value.custom_field) + ":", :class => 'label') +
335
                        content_tag('div', custom_field_value_tag(value), :class => 'value')
336
              content = content_tag('div', content, :class => "#{value.custom_field.css_classes} attribute")
337
              s += content_tag('div', content, :class => 'splitcontent')
338
            end
339
          end
340
        end
341
      end
322
      content =
323
        content_tag('hr') +
324
        content_tag('p', content_tag('strong', custom_field_name_tag(value.custom_field) )) +
325
        content_tag('div', attr_value_tag, class: 'value')
326
      s << content_tag('div', content, class: "#{value.custom_field.css_classes} attribute")
327 342
    end
328 343
    s
329 344
  end
......
384 399
        end
385 400
      end
386 401
    end
387
    issue.visible_custom_field_values(user).each do |value|
388
      cf_value = show_value(value, false)
389
      next if cf_value.blank?
390
      if html
391
        items << content_tag('strong', "#{value.custom_field.name}: ") + cf_value
392
      else
393
        items << "#{value.custom_field.name}: #{cf_value}"
402
    group_by_keys(issue.project_id, issue.tracker_id, issue.visible_custom_field_values(user)).each do |title, values|
403
      if values.present?
404
        item = [ (html ? content_tag('strong', "#{title}") : "#{title}") ] unless title.nil?
405
        values.each do |value|
406
          (title.nil? ? items : item) << (html ?
407
            content_tag('strong', "#{value.custom_field.name}: ") + show_value(value, false) :
408
            "#{value.custom_field.name}: #{show_value(value, false)}")
409
        end
410
        items << item unless title.nil?
394 411
      end
395 412
    end
396 413
    items
......
399 416
  def render_email_issue_attributes(issue, user, html=false)
400 417
    items = email_issue_attributes(issue, user, html)
401 418
    if html
402
      content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe, :class => "details")
419
      content_tag('ul', items.select{|s| s.is_a? String}.map{|s| content_tag('li', s)}.join("\n").html_safe, :class => "details") + "\n" +
420
        items.select{|s| !s.is_a? String}.map{|item| content_tag('div', item.shift) + "\n" +
421
        content_tag('ul', item.map{|s| content_tag('li', s)}.join("\n").html_safe, :class => "details")}.join("\n").html_safe
403 422
    else
404
      items.map{|s| "* #{s}"}.join("\n")
423
      items.select{|s| s.is_a? String}.map{|s| "* #{s}"}.join("\n") + "\n" +
424
      items.select{|s| !s.is_a? String}.map{|item| "#{item.shift}\n" + item.map{|s| "* #{s}"}.join("\n")}.join("\n")
405 425
    end
406 426
  end
407 427

  
app/helpers/projects_helper.rb
39 39
        {:name => 'boards', :action => :manage_boards,
40 40
         :partial => 'projects/settings/boards', :label => :label_board_plural},
41 41
        {:name => 'activities', :action => :manage_project_activities,
42
         :partial => 'projects/settings/activities', :label => :label_time_tracking}
42
         :partial => 'projects/settings/activities', :label => :label_time_tracking},
43
        {:name => 'groupissuescustomfields', :action => :edit_project,
44
         :partial => 'projects/settings/groupissuescustomfields', :label => :grouped_cf}
43 45
      ]
44 46
    tabs.
45 47
      select {|tab| User.current.allowed_to?(tab[:action], @project)}.
app/models/attribute_group.rb
1
class AttributeGroup < ActiveRecord::Base
2
  belongs_to :project
3
  belongs_to :tracker
4
  has_many :attribute_group_fields, :dependent => :delete_all
5
  has_many :custom_fields, :through => :attribute_group_fields
6
  acts_as_positioned
7

  
8
  scope :sorted, lambda { order(:position) }
9
end
app/models/attribute_group_field.rb
1
class AttributeGroupField < ActiveRecord::Base
2
  belongs_to :attribute_group
3
  belongs_to :custom_field
4
  acts_as_positioned
5

  
6
  scope :sorted, lambda { order(:position) }
7
end
app/models/custom_field.rb
26 26
           :class_name => 'CustomFieldEnumeration',
27 27
           :dependent => :delete_all
28 28
  has_many :custom_values, :dependent => :delete_all
29
  has_many :attribute_group_fields, :dependent => :delete_all
29 30
  has_and_belongs_to_many :roles, :join_table => "#{table_name_prefix}custom_fields_roles#{table_name_suffix}", :foreign_key => "custom_field_id"
30 31
  acts_as_positioned
31 32
  serialize :possible_values
app/models/project.rb
53 53
  has_many :changesets, :through => :repository
54 54
  has_one :wiki, :dependent => :destroy
55 55
  # Custom field for the project issues
56
  has_many :attribute_groups, :dependent => :destroy
57
  has_many :attribute_group_fields, :through => :attribute_groups
56 58
  has_and_belongs_to_many :issue_custom_fields,
57 59
                          lambda {order(:position)},
58 60
                          :class_name => 'IssueCustomField',
app/models/tracker.rb
32 32
  has_many :workflow_rules, :dependent => :delete_all
33 33
  has_and_belongs_to_many :projects
34 34
  has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_trackers#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
35
  has_many :attribute_groups, :dependent => :destroy
36
  has_many :attribute_group_fields, :through => :attribute_groups
35 37
  acts_as_positioned
36 38

  
37 39
  validates_presence_of :default_status
app/views/issues/_form_custom_fields.html.erb
1
<% custom_field_values = @issue.editable_custom_field_values %>
2
<% custom_field_values_full_width = custom_field_values.select { |value| value.custom_field.full_width_layout? } %>
3
<% custom_field_values -= custom_field_values_full_width %>
4

  
5
<% if custom_field_values.present? %>
1
<% group_by_keys(@issue.project_id, @issue.tracker_id, @issue.editable_custom_field_values).each do |title,values| %>
2
<% if values.present? %>
3
<%= content_tag('h4', title, :style => 'background: #0001; padding: 0.3em;') unless title.nil? %>
4
<% while values.present? %>
5
<% if values[0].custom_field.full_width_layout? %>
6
<div>
7
<% while values.present? && values[0].custom_field.full_width_layout? %>
8
<% value = values.shift %>
9
<p><%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %></p>
10
<%= wikitoolbar_for "issue_custom_field_values_#{value.custom_field_id}", preview_issue_path(:project_id => @issue.project, :issue_id => @issue.id) if value.custom_field.full_text_formatting? %>
11
<% end %>
12
<% else %>
6 13
<div class="splitcontent">
14
<% lr_values = [] %>
15
<% while values.present? && ! values[0].custom_field.full_width_layout? %>
16
<% lr_values += [ values.shift ] %>
17
<% end %>
7 18
<div class="splitcontentleft">
8 19
<% i = 0 %>
9
<% split_on = (custom_field_values.size / 2.0).ceil - 1 %>
10
<% custom_field_values.each do |value| %>
11
  <p><%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %></p>
12
<% if i == split_on -%>
20
<% split_on = (lr_values.size / 2.0).ceil - 1 %>
21
<% lr_values.each do |value| %>
22
<p><%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %></p>
23
<% if i == split_on %>
13 24
</div><div class="splitcontentright">
14
<% end -%>
15
<% i += 1 -%>
16
<% end -%>
25
<% end %>
26
<% i += 1 %>
27
<% end %>
17 28
</div>
29
<% end %>
18 30
</div>
19 31
<% end %>
20

  
21
<% custom_field_values_full_width.each do |value| %>
22
  <p><%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %></p>
23
  <%= wikitoolbar_for "issue_custom_field_values_#{value.custom_field_id}", preview_issue_path(:project_id => @issue.project, :issue_id => @issue.id) if value.custom_field.full_text_formatting? %>
32
<% end %>
24 33
<% end %>
app/views/issues/show.html.erb
71 71
    rows.right l(:label_spent_time), issue_spent_hours_details(@issue), :class => 'spent-time'
72 72
  end
73 73
end %>
74
<%= render_half_width_custom_fields_rows(@issue) %>
74
<%= render_custom_fields_rows(@issue) %>
75 75
<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
76 76
</div>
77 77

  
......
94 94
  <%= link_to_attachments @issue, :thumbnails => true %>
95 95
<% end %>
96 96

  
97
<%= render_full_width_custom_fields_rows(@issue) %>
98

  
99 97
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
100 98

  
101 99
<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
app/views/projects/settings/_groupissuescustomfields.html.erb
1
<p><%= select_tag "tracker_id", options_from_collection_for_select(@project.trackers.collect, "id", "name"), {:required => true, :onchange => "refresh_trackers(this);"} %><p>
2

  
3
<div id='custom_fields_form'>
4
  <% @project.trackers.each do |t| %>
5
  <div id='tracker_<%= t.id %>' class='tracker'>
6
    <span style="color: #888;"><%= l(:changed_cf_position) %></span>
7
    <ul class='sortable_items sortable_tracker-<%= t.id %> nil not_a_group'>
8
      <% @cfs.select{|x| x[0]==t.id && x[2]==nil}.each do |x| %>
9
      <li id="<%= x[6] %>" pos="<%= x[8] %>"><%= x[7] %></li>
10
      <% end %>
11
    </ul>
12
    <span style="color: #888;"><%= l(:global_cf_position) %></span>
13
    <ul class="sortable_items sortable_tracker-<%= t.id %> unsorted not_a_group">
14
      <% Issue.new(project_id: @project.id, tracker_id: t.id).custom_field_values.
15
           select{|x| ! @cfs.select{|c| c[0]==t.id}.map{|c| c[6]}.include?(x.custom_field_id)}.
16
           collect{|x| [x.custom_field.id, x.custom_field.name, x.custom_field.position]}.each do |x| %>
17
      <li id="<%= x[0] %>" pos="<%= x[2] %>"><%= x[1] %></li>
18
      <% end %>
19
    </ul>
20
    <span style="color: #888;"><%= l(:grouped_cf) %></span>
21
    <div class='sortable_groups groups_tracker-<%= t.id %>'>
22
      <% @cfs.select{|x| x[0]==t.id && x[2]!=nil}.map{|x| x[2]}.uniq.each do |g| %>
23
      <div class="sortable_group">
24
        <input type="text" value="<%= g %>" style="background: #ddf; padding: 5px; width: 360px"/>
25
        <img src="/images/delete.png" onclick="remove_label(this, 'tracker-<%= t.id %>');"/>
26
        <ul class='sortable_items sortable_tracker-<%= t.id %>'>
27
          <% @cfs.select{|x| x[0]==t.id && x[2]==g}.each do |x| %>
28
          <li id="<%= x[6] %>" pos="<%= x[8] %>"><%= x[7] %></li>
29
          <% end %>
30
        </ul>
31
      </div>
32
      <% end %>
33
      <div>
34
        <input type="text" value="" style="background: #ddf; padding: 5px; width: 370px"/>
35
        <img src="/images/add.png" style="" onclick="add_label(this, 'tracker-<%= t.id %>');"/>
36
      </div>
37
    </div>
38
  </div>
39
  <% end %>
40
<%= form_for @project, :url => { :action => 'groupissuescustomfields', :id => @project },
41
            :html => {:id => 'groupissuescustomfields-form',
42
                      :method => :post} do |f| %>
43

  
44
<%= hidden_field :group_issues_custom_fields, '', :id => 'group_issues_custom_fields', :name => 'group_issues_custom_fields' %>
45
<p><%= submit_tag l(:button_save), :onclick => "fill_json_data();" %></p>
46
<% end %>
47
</div>
48

  
49
<script>
50
function init_sortables(labelclass) {
51
  $( '.groups_' + labelclass ).sortable({
52
    items: 'div.sortable_group',
53
    connectWith: '.groups_' + labelclass,
54
    start: function(event, ui) {
55
      ui.placeholder.height(ui.item.height());
56
    },
57
    axis: 'y'
58
  });
59
  $( '.sortable_' + labelclass ).sortable({
60
    connectWith: '.sortable_' + labelclass,
61
    update: function(event, ui) {
62
      if (ui.item.parent().hasClass('unsorted')) {
63
        ui.item.parent().prepend(ui.item);
64
        ui.item.parent().children('li').each(function () {
65
          if (parseInt($(this).attr('pos')) < parseInt(ui.item.attr('pos'))) {
66
            ui.item.insertAfter(this);
67
          }
68
        });
69
      }
70
    },
71
    axis: 'y'
72
  }).disableSelection();
73
}
74
function refresh_trackers(tracker) {
75
  $('.tracker').hide();
76
  $('#tracker_' + tracker.value).show();
77
}
78
function add_label(label, labelclass) {
79
  var old_label = $(label), new_label = $(label).parent().clone();
80
  new_label.children().first().val('').trigger('change');
81
  old_label.attr('src','/images/delete.png').attr('onclick','remove_label(this, "' + labelclass + '");');
82
  old_label.prev().width('360px');
83
  old_label.parent().addClass('ui-sortable-handle sortable_group');
84
  old_label.parent().sortable({
85
    connectWith: '.groups_' + labelclass
86
  }).disableSelection();
87
  old_label.parent().append('<ul id="' + labelclass + '_" class="sortable_items sortable_' + labelclass + '"/>');
88
  old_label.next().sortable({
89
    connectWith: '.sortable_' + labelclass
90
  }).disableSelection();
91
  old_label.parent().parent().append(new_label);
92
}
93
function remove_label(label, labelclass) {
94
  $(label).next().children().each(function () {
95
    var item = this;
96
    $('.unsorted.sortable_' + labelclass).prepend(this);
97
    $('.unsorted.sortable_' + labelclass).children('li').each(function () {
98
      if (parseInt($(this).attr('pos')) < parseInt($(item).attr('pos'))) {
99
        $(item).insertAfter(this);
100
      }
101
    });
102
  });
103
  $(label).parent().hide();
104
}
105
function fill_json_data() {
106
  var r = {}, gp = 0, cp = 0;
107
  $('#custom_fields_form').children('div').each(function () {
108
    var tracker_id = this.id.split('_').pop();
109
    gp = 0, cp = 0;
110

  
111
    // Group 'nil'
112
    r[tracker_id] = {};
113
    r[tracker_id][++gp] = {'cfs': {}};
114
    $(this).children('.nil').children().each(function () {
115
      cp++;
116
      r[tracker_id][gp]['cfs'][cp] = this.id;
117
    });
118
    if (! r[tracker_id][gp]['cfs'][1]) { delete r[tracker_id][gp]; }
119
    $(this).children('.sortable_groups').children().each(function () {
120
      if ($(this).children('ul').length) {
121
        r[tracker_id][++gp] = {
122
          'name': $(this).children('input').val(),
123
          'cfs': {}
124
        };
125
        cp = 0;
126
        $(this).children('ul').children().each(function () {
127
          r[tracker_id][gp]['cfs'][++cp] = this.id;
128
        });
129
        if (! r[tracker_id][gp]['cfs'][1]) { r[tracker_id][gp] = ''; }
130
      }
131
    });
132
    if ( ! r[tracker_id] ) { r[tracker_id] = ''; }
133
  });
134
  console.log(r);
135
  $('#group_issues_custom_fields').val(JSON.stringify(r)); }
136
$('#tracker_id').change();
137
<% @project.trackers.each do |t| %>
138
init_sortables('tracker-<%= t.id %>');
139
<% end %>
140
</script>
config/locales/en.yml
1278 1278
  description_issue_category_reassign: Choose issue category
1279 1279
  description_wiki_subpages_reassign: Choose new parent page
1280 1280
  text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.'
1281
  grouped_cf: Grouped Custom Fields
1282
  global_cf_position: Global Custom Fields Position
1283
  changed_cf_position: Changed Custom Fields Position
1281 1284
  text_login_required_html: When not requiring authentication, public projects and their contents are openly available on the network. You can <a href="%{anonymous_role_path}">edit the applicable permissions</a>.
1282 1285
  label_login_required_yes: "Yes"
1283 1286
  label_login_required_no: "No, allow anonymous access to public projects"
config/locales/pt-BR.yml
1240 1240
  permission_view_news: Ver notícias
1241 1241
  label_no_preview_alternative_html: Visualização não disponível. Faça o %{link} do arquivo.
1242 1242
  label_no_preview_download: download
1243
  grouped_cf: Agrupar campos personalizados
1244
  global_cf_position: Posição global de campos personalizados
1245
  changed_cf_position: Alterar posição de campos personalizados
1243 1246
  setting_close_duplicate_issues: Fechar tarefas duplicadas automaticamente
1244 1247
  error_exceeds_maximum_hours_per_day: Não é possível registrar mais de %{max_hours} horas no mesmo dia (%{logged_hours} horas já foram registradas)
1245 1248
  setting_time_entry_list_defaults: Registro de horas padrão
config/routes.rb
108 108

  
109 109
    member do
110 110
      get 'settings(/:tab)', :action => 'settings', :as => 'settings'
111
      post 'groupissuescustomfields'
111 112
      post 'archive'
112 113
      post 'unarchive'
113 114
      post 'close'
db/migrate/20180913211420_create_attribute_groups.rb
1
class CreateAttributeGroups < ActiveRecord::Migration[4.2]
2
  def change
3
    create_table :attribute_groups do |t|
4
      t.references :project, index: true, foreign_key: true
5
      t.references :tracker, index: true, foreign_key: true
6
      t.string :name
7
      t.integer :position, :default => 1, :null => false
8

  
9
      t.timestamps null: false
10
    end
11
  end
12
end
db/migrate/20180913212008_create_attribute_group_fields.rb
1
class CreateAttributeGroupFields < ActiveRecord::Migration[4.2]
2
  def change
3
    create_table :attribute_group_fields do |t|
4
      t.references :attribute_group, index: true, foreign_key: true
5
      t.references :custom_field, index: true, foreign_key: true
6
      t.integer :position
7

  
8
      t.timestamps null: false
9
    end
10
  end
11
end
db/migrate/20190301162408_change_group_position_attributes.rb
1
class ChangeGroupPositionAttributes < ActiveRecord::Migration[4.2]
2
  def change
3
    change_column_null :attribute_groups, :position, true
4
    change_column_default :attribute_groups, :position, nil
5
  end
6
end
lib/redmine.rb
81 81
  map.permission :view_project, {:projects => [:show, :bookmark], :activities => [:index]}, :public => true, :read => true
82 82
  map.permission :search_project, {:search => :index}, :public => true, :read => true
83 83
  map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
84
  map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
84
  map.permission :edit_project, {:projects => [:settings, :edit, :update, :groupissuescustomfields]}, :require => :member
85 85
  map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true
86 86
  map.permission :select_project_modules, {:projects => :modules}, :require => :member
87 87
  map.permission :view_members, {:members => [:index, :show]}, :public => true, :read => true
lib/redmine/export/pdf/issues_pdf_helper.rb
64 64
          left  << nil while left.size  < rows
65 65
          right << nil while right.size < rows
66 66

  
67
          custom_field_values = issue.visible_custom_field_values.reject {|value| value.custom_field.full_width_layout?}
68
          half = (custom_field_values.size / 2.0).ceil
69
          custom_field_values.each_with_index do |custom_value, i|
70
            (i < half ? left : right) << [custom_value.custom_field.name, show_value(custom_value, false)]
71
          end
72 67

  
73 68
          if pdf.get_rtl
74 69
            border_first_top = 'RT'
......
82 77
            border_last  = 'R'
83 78
          end
84 79

  
80
          border_middle_top  = 'T'
81

  
85 82
          rows = left.size > right.size ? left.size : right.size
86 83
          rows.times do |i|
87 84
            heights = []
......
101 98
            pdf.SetFontStyle('B',9)
102 99
            pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
103 100
            pdf.SetFontStyle('',9)
104
            pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 0)
105 101

  
102
            pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_middle_top : ""), '', 0, 0)
103

  
106 104
            item = right[i]
107 105
            pdf.SetFontStyle('B',9)
108
            pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "",  (i == 0 ? border_first_top : border_first), '', 0, 0)
106
            pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "",  (i == 0 ? border_middle_top : ""), '', 0, 0)
109 107
            pdf.SetFontStyle('',9)
110 108
            pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 2)
111 109

  
112 110
            pdf.set_x(base_x)
113 111
          end
114 112

  
113
          group_by_keys(issue.project_id, issue.tracker_id, issue.visible_custom_field_values).each do |title, values|
114
            if values.present?
115
              unless title.nil?
116
                pdf.RDMCell(35+155, 5, title, "LRT", 1)
117
              end
118

  
119
              while values.present?
120
                if values[0].custom_field.full_width_layout?
121
                  while values.present? && values[0].custom_field.full_width_layout?
122
                    value = values.shift
123
                    pdf.SetFontStyle('B',9)
124
                    pdf.RDMCell(35, 5, "#{value.custom_field.name}:", 'L', 0)
125
                    pdf.SetFontStyle('',9)
126
                    pdf.RDMCell(155, 5, show_value(value, false).to_s, 'R', 1)
127
                  end
128
                else
129
                  lr_values = []
130
                  while values.present? && ! values[0].custom_field.full_width_layout?
131
                    lr_values += [ values.shift ]
132
                  end
133

  
134
                  half = (lr_values.size / 2.0).ceil
135
                  left = []
136
                  right = []
137
                  lr_values.each_with_index do |custom_value, i|
138
                    (i < half ? left : right) << [custom_value.custom_field.name, show_value(custom_value, false)]
139
                  end
140

  
141
                  rows = left.size > right.size ? left.size : right.size
142
                  rows.times do |i|
143
                    heights = []
144
                    pdf.SetFontStyle('B',9)
145
                    item = left[i]
146
                    heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
147
                    item = right[i]
148
                    heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
149
                    pdf.SetFontStyle('',9)
150
                    item = left[i]
151
                    heights << pdf.get_string_height(60, item ? item.last.to_s  : "")
152
                    item = right[i]
153
                    heights << pdf.get_string_height(60, item ? item.last.to_s  : "")
154
                    height = heights.max
155

  
156
                    item = left[i]
157
                    pdf.SetFontStyle('B',9)
158
                    pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", border_first, '', 0, 0)
159
                    pdf.SetFontStyle('',9)
160
                    pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", "", '', 0, 0)
161

  
162
                    item = right[i]
163
                    pdf.SetFontStyle('B',9)
164
                    pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "",  "", '', 0, 0)
165
                    pdf.SetFontStyle('',9)
166
                    pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", border_last, '', 0, 2)
167

  
168
                    pdf.set_x(base_x)
169
                  end
170
                end
171
              end
172
            end
173
          end
174

  
115 175
          pdf.SetFontStyle('B',9)
116 176
          pdf.RDMCell(35+155, 5, l(:field_description), "LRT", 1)
117 177
          pdf.SetFontStyle('',9)
......
128 188
            )
129 189
          pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB")
130 190

  
131
          custom_field_values = issue.visible_custom_field_values.select {|value| value.custom_field.full_width_layout?}
132
          custom_field_values.each do |value|
133
            text = show_value(value, false)
134
            next if text.blank?
135

  
136
            pdf.SetFontStyle('B',9)
137
            pdf.RDMCell(35+155, 5, value.custom_field.name, "LRT", 1)
138
            pdf.SetFontStyle('',9)
139
            pdf.RDMwriteHTMLCell(35+155, 5, '', '', text, issue.attachments, "LRB")
140
          end
141

  
142 191
          unless issue.leaf?
143 192
            truncate_length = (!is_cjk? ? 90 : 65)
144 193
            pdf.SetFontStyle('B',9)
public/stylesheets/application.css
522 522
div.issue span.private, div.journal span.private {font-size: 60%;}
523 523
div.issue .next-prev-links {color:#999;}
524 524
div.issue .attributes {margin-top: 2em;}
525
div.issue .attributes .attribute {padding-left:180px; clear:left; min-height: 1.8em;}
526
div.issue .attributes .attribute .label {width: 170px; margin-left:-180px; font-weight:bold; float:left;  overflow:hidden; text-overflow: ellipsis;}
525
div.issue .attributes .attribute {padding-left:225px; clear:left; min-height: 1.8em;}
526
div.issue .attributes .attribute .label {width: 215px; margin-left:-225px; font-weight:bold; float:left; overflow:hidden; text-overflow: ellipsis;}
527 527
div.issue .attribute .value {overflow:auto; text-overflow: ellipsis;}
528
div.issue .attribute .value p {margin: 0 0 0.8em 0;}
528 529
div.issue.overdue .due-date .value { color: #c22; }
529 530

  
530 531
#issue_tree table.issues, #relations table.issues { border: 0; }
......
1735 1736
  max-height: 100%;
1736 1737
  max-width: 100%;
1737 1738
}
1739

  
1740
/* Custom Field Groups */
1741
.sortable_groups {
1742
  background: #eee;
1743
  border: 1px solid #888;
1744
  width: 445px;
1745
  min-height: 30px;
1746
  margin: 5px;
1747
  padding: 5px;
1748
}
1749
.sortable_groups div {
1750
  background: #ddf;
1751
  border: 1px solid #888;
1752
  min-height: 30px;
1753
  margin: 5px;
1754
  padding: 5px;
1755
}
1756
.sortable_items {
1757
  background: #eee;
1758
  border: 1px solid #888;
1759
  width: 400px;
1760
  min-height: 30px;
1761
  margin: 5px;
1762
  padding: 5px;
1763
}
1764
.sortable_items li {
1765
  background: #ffffff;
1766
  border: 1px solid #888;
1767
  margin: 5px;
1768
  padding: 5px;
1769
  list-style-type: none;
1770
  font-size: 1.2em;
1771
}
1772
.not_a_group {
1773
  padding: 5px 27px;
1774
}
1775
.ui-sortable-handle:before {
1776
  content:url('/images/reorder.png');
1777
  margin-right: 5px;
1778
}
1779
.ui-sortable-placeholder {
1780
  background: #8888ff;
1781
  border: 1px solid #888;
1782
  visibility: visible;
1783
}
1738 1784

  
1739 1785
.filecontent-container > .filecontent.wiki {
1740 1786
  position: relative;
test/fixtures/attribute_group_fields.yml
1
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
2

  
3
one:
4
  attribute_group_id: 
5
  custom_field_id: 
6
  position: 1
7

  
8
two:
9
  attribute_group_id: 
10
  custom_field_id: 
11
  position: 1
test/fixtures/attribute_groups.yml
1
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
2

  
3
one:
4
  project_id: 
5
  tracker_id: 
6
  name: MyString
7
  position: 1
8

  
9
two:
10
  project_id: 
11
  tracker_id: 
12
  name: MyString
13
  position: 1
(1-1/4)