diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-10-13 07:37:49 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-10-13 07:37:49 +0000 |
| commit | b6cb7aa8e3b98db4095a1869d1ce51aefaf308db (patch) | |
| tree | f0b496dd9b19c52b1c499af33802c229d570862a /app/views | |
| parent | b8aa4da28a1e61d3d14e296cddd3584d505da3c3 (diff) | |
| download | redmine-b6cb7aa8e3b98db4095a1869d1ce51aefaf308db.tar.gz redmine-b6cb7aa8e3b98db4095a1869d1ce51aefaf308db.zip | |
Ability to define commit keywords per tracker (#7590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12208 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/settings/_repositories.html.erb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb index d90c212ec..e95a3fee1 100644 --- a/app/views/settings/_repositories.html.erb +++ b/app/views/settings/_repositories.html.erb @@ -80,6 +80,7 @@ <table class="list" id="commit-keywords"> <thead> <tr> + <th><%= l(:label_tracker) %></th> <th><%= l(:setting_commit_fix_keywords) %></th> <th><%= l(:label_applied_status) %></th> <th><%= l(:field_done_ratio) %></th> @@ -87,15 +88,17 @@ </tr> </thead> <tbody> - <% @commit_update_keywords.each do |keywords, updates| %> + <% @commit_update_keywords.each do |rule| %> <tr class="commit-keywords"> - <td><%= text_field_tag "settings[commit_update_keywords][keywords][]", keywords, :size => 30 %></td> - <td><%= select_tag "settings[commit_update_keywords][status_id][]", options_for_select([["", 0]] + IssueStatus.sorted.all.collect{|status| [status.name, status.id.to_s]}, updates['status_id']) %></td> - <td><%= select_tag "settings[commit_update_keywords][done_ratio][]", options_for_select([["", ""]] + (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, updates['done_ratio']) %></td> + <td><%= select_tag "settings[commit_update_keywords][if_tracker_id][]", options_for_select([[l(:label_all), ""]] + Tracker.sorted.all.map {|t| [t.name, t.id.to_s]}, rule['if_tracker_id']) %></td> + <td><%= text_field_tag "settings[commit_update_keywords][keywords][]", rule['keywords'], :size => 30 %></td> + <td><%= select_tag "settings[commit_update_keywords][status_id][]", options_for_select([["", 0]] + IssueStatus.sorted.all.collect{|status| [status.name, status.id.to_s]}, rule['status_id']) %></td> + <td><%= select_tag "settings[commit_update_keywords][done_ratio][]", options_for_select([["", ""]] + (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, rule['done_ratio']) %></td> <td class="buttons"><%= link_to image_tag('delete.png'), '#', :class => 'delete-commit-keywords' %></td> </tr> <% end %> <tr> + <td></td> <td><em class="info"><%= l(:text_comma_separated) %></em></td> <td></td> <td></td> |