Browse Source

Removed duplicate element ids.

git-svn-id: http://svn.redmine.org/redmine/trunk@13644 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.0.0
Jean-Philippe Lang 9 years ago
parent
commit
1e0045e69b

+ 1
- 1
app/helpers/workflows_helper.rb View File

tag_name = "transitions[#{ old_status.id }][#{new_status.id}][#{name}]" tag_name = "transitions[#{ old_status.id }][#{new_status.id}][#{name}]"
if w == 0 || w == @roles.size * @trackers.size if w == 0 || w == @roles.size * @trackers.size
hidden_field_tag(tag_name, "0") +
hidden_field_tag(tag_name, "0", :id => nil) +
check_box_tag(tag_name, "1", w != 0, check_box_tag(tag_name, "1", w != 0,
:class => "old-status-#{old_status.id} new-status-#{new_status.id}") :class => "old-status-#{old_status.id} new-status-#{new_status.id}")
else else

+ 1
- 1
app/views/activities/index.html.erb View File

<% end %> <% end %>
</ul> </ul>
<% if @project && @project.descendants.active.any? %> <% if @project && @project.descendants.active.any? %>
<%= hidden_field_tag 'with_subprojects', 0 %>
<%= hidden_field_tag 'with_subprojects', 0, :id => nil %>
<p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p> <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
<% end %> <% end %>
<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %> <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>

+ 1
- 1
app/views/issues/bulk_edit.html.erb View File

</ul> </ul>


<%= form_tag(bulk_update_issues_path, :id => 'bulk_edit_form') do %> <%= form_tag(bulk_update_issues_path, :id => 'bulk_edit_form') do %>
<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %>
<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id, :id => nil)}.join("\n").html_safe %>
<div class="box tabular"> <div class="box tabular">
<fieldset class="attributes"> <fieldset class="attributes">
<legend><%= l(:label_change_properties) %></legend> <legend><%= l(:label_change_properties) %></legend>

+ 1
- 1
app/views/issues/destroy.html.erb View File

<h2><%= l(:label_confirmation) %></h2> <h2><%= l(:label_confirmation) %></h2>


<%= form_tag({}, :method => :delete) do %> <%= form_tag({}, :method => :delete) do %>
<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %>
<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id, :id => nil)}.join("\n").html_safe %>
<div class="box"> <div class="box">
<p><strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(@hours, :precision => 2)) %></strong></p> <p><strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(@hours, :precision => 2)) %></strong></p>
<p> <p>

+ 1
- 1
app/views/principal_memberships/_index.html.erb View File

:disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?}, :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?},
:id => nil %> <%=h role %></label><br /> :id => nil %> <%=h role %></label><br />
<% end %></p> <% end %></p>
<%= hidden_field_tag 'membership[role_ids][]', '' %>
<%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %>
<p><%= submit_tag l(:button_change) %> <p><%= submit_tag l(:button_change) %>
<%= link_to_function l(:button_cancel), <%= link_to_function l(:button_cancel),
"$('#member-#{membership.id}-roles').show(); $('#member-#{membership.id}-roles-form').hide(); return false;" "$('#member-#{membership.id}-roles').show(); $('#member-#{membership.id}-roles-form').hide(); return false;"

+ 7
- 7
app/views/projects/copy.html.erb View File

<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>


<fieldset class="box tabular"><legend><%= l(:button_copy) %></legend> <fieldset class="box tabular"><legend><%= l(:button_copy) %></legend>
<label class="block"><%= check_box_tag 'only[]', 'members', true %> <%= l(:label_member_plural) %> (<%= @source_project.members.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'versions', true %> <%= l(:label_version_plural) %> (<%= @source_project.versions.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'issue_categories', true %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'issues', true %> <%= l(:label_issue_plural) %> (<%= @source_project.issues.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'queries', true %> <%= l(:label_query_plural) %> (<%= @source_project.queries.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'boards', true %> <%= l(:label_board_plural) %> (<%= @source_project.boards.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'wiki', true %> <%= l(:label_wiki_page_plural) %> (<%= @source_project.wiki.nil? ? 0 : @source_project.wiki.pages.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'members', true, :id => nil %> <%= l(:label_member_plural) %> (<%= @source_project.members.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'versions', true, :id => nil %> <%= l(:label_version_plural) %> (<%= @source_project.versions.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'issue_categories', true, :id => nil %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'issues', true, :id => nil %> <%= l(:label_issue_plural) %> (<%= @source_project.issues.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'queries', true, :id => nil %> <%= l(:label_query_plural) %> (<%= @source_project.queries.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'boards', true, :id => nil %> <%= l(:label_board_plural) %> (<%= @source_project.boards.count %>)</label>
<label class="block"><%= check_box_tag 'only[]', 'wiki', true, :id => nil %> <%= l(:label_wiki_page_plural) %> (<%= @source_project.wiki.nil? ? 0 : @source_project.wiki.pages.count %>)</label>
<%= hidden_field_tag 'only[]', '' %> <%= hidden_field_tag 'only[]', '' %>
<br /> <br />
<label class="block"><%= check_box_tag 'notifications', 1, params[:notifications] %> <%= l(:label_project_copy_notifications) %></label> <label class="block"><%= check_box_tag 'notifications', 1, params[:notifications] %> <%= l(:label_project_copy_notifications) %></label>

+ 1
- 1
app/views/projects/settings/_members.html.erb View File

</label><br /> </label><br />
<% end %> <% end %>
</p> </p>
<%= hidden_field_tag 'membership[role_ids][]', '' %>
<%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %>
<p> <p>
<%= submit_tag l(:button_save), :class => "small" %> <%= submit_tag l(:button_save), :class => "small" %>
<%= link_to_function(l(:button_cancel), <%= link_to_function(l(:button_cancel),

+ 1
- 1
app/views/repositories/committers.html.erb View File

<tr class="<%= cycle 'odd', 'even' %>"> <tr class="<%= cycle 'odd', 'even' %>">
<td><%=h committer %></td> <td><%=h committer %></td>
<td> <td>
<%= hidden_field_tag "committers[#{i}][]", committer %>
<%= hidden_field_tag "committers[#{i}][]", committer, :id => nil %>
<%= select_tag "committers[#{i}][]", <%= select_tag "committers[#{i}][]",
content_tag( content_tag(
'option', 'option',

+ 7
- 4
app/views/settings/_repositories.html.erb View File

options_for_select( options_for_select(
[[l(:label_all), ""]] + [[l(:label_all), ""]] +
Tracker.sorted.map {|t| [t.name, t.id.to_s]}, Tracker.sorted.map {|t| [t.name, t.id.to_s]},
rule['if_tracker_id'])
rule['if_tracker_id']),
:id => nil
) %> ) %>
</td> </td>
<td> <td>
<%= text_field_tag("settings[commit_update_keywords][keywords][]", <%= text_field_tag("settings[commit_update_keywords][keywords][]",
rule['keywords'], :size => 30) %>
rule['keywords'], :id => nil, :size => 30) %>
</td> </td>
<td> <td>
<%= select_tag("settings[commit_update_keywords][status_id][]", <%= select_tag("settings[commit_update_keywords][status_id][]",
[["", 0]] + [["", 0]] +
IssueStatus.sorted. IssueStatus.sorted.
collect{|status| [status.name, status.id.to_s]}, collect{|status| [status.name, status.id.to_s]},
rule['status_id'])
rule['status_id']),
:id => nil
) %> ) %>
</td> </td>
<td> <td>
options_for_select( options_for_select(
[["", ""]] + [["", ""]] +
(0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
rule['done_ratio'])
rule['done_ratio']),
:id => nil
) %> ) %>
</td> </td>
<td class="buttons"> <td class="buttons">

+ 1
- 1
app/views/timelog/bulk_edit.html.erb View File

</ul> </ul>


<%= form_tag(bulk_update_time_entries_path, :id => 'bulk_edit_form') do %> <%= form_tag(bulk_update_time_entries_path, :id => 'bulk_edit_form') do %>
<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id, :id => nil)}.join.html_safe %>
<div class="box tabular"> <div class="box tabular">
<div> <div>
<p> <p>

+ 1
- 1
app/views/versions/index.html.erb View File

</li> </li>
<% if @project.descendants.active.any? %> <% if @project.descendants.active.any? %>
<li> <li>
<%= hidden_field_tag 'with_subprojects', 0 %>
<%= hidden_field_tag 'with_subprojects', 0, :id => nil %>
<label> <label>
<%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%> <%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%>
</label> </label>

+ 4
- 4
app/views/workflows/edit.html.erb View File



<%= submit_tag l(:button_edit), :name => nil %> <%= submit_tag l(:button_edit), :name => nil %>


<%= hidden_field_tag 'used_statuses_only', '0' %>
<%= hidden_field_tag 'used_statuses_only', '0', :id => nil %>
<label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label> <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>


</p> </p>


<% if @trackers && @roles && @statuses.any? %> <% if @trackers && @roles && @statuses.any? %>
<%= form_tag({}, :id => 'workflow_form' ) do %> <%= form_tag({}, :id => 'workflow_form' ) do %>
<%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id}.join.html_safe %>
<%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id}.join.html_safe %>
<%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only] %>
<%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id, :id => nil}.join.html_safe %>
<%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id, :id => nil}.join.html_safe %>
<%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only], :id => nil %>
<div class="autoscroll"> <div class="autoscroll">
<%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %> <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>



+ 4
- 4
app/views/workflows/permissions.html.erb View File



<%= submit_tag l(:button_edit), :name => nil %> <%= submit_tag l(:button_edit), :name => nil %>


<%= hidden_field_tag 'used_statuses_only', '0' %>
<%= hidden_field_tag 'used_statuses_only', '0', :id => nil %>
<label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label> <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
</p> </p>
<% end %> <% end %>


<% if @trackers && @roles && @statuses.any? %> <% if @trackers && @roles && @statuses.any? %>
<%= form_tag({}, :id => 'workflow_form' ) do %> <%= form_tag({}, :id => 'workflow_form' ) do %>
<%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id}.join.html_safe %>
<%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id}.join.html_safe %>
<%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only] %>
<%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id, :id => nil}.join.html_safe %>
<%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id, :id => nil}.join.html_safe %>
<%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only], :id => nil %>
<div class="autoscroll"> <div class="autoscroll">
<table class="list workflows fields_permissions"> <table class="list workflows fields_permissions">
<thead> <thead>

Loading…
Cancel
Save