jro_apps/redmine Commit - r15669:826e978806bb

Removes calls to #reset_cycle (#15361)....

Jean-Philippe Lang -

r15669:826e978806bb

parent child

Context file:

r15669:826e978806bb

Collapse all files

app/views/custom_fields/_index.html.erb +1 -1

             <table class="list custom_fields">
               <thead><tr>
                 <th><%=l(:field_name)%></th>
                 <th><%=l(:field_field_format)%></th>
                 <th><%=l(:field_is_required)%></th>
                 <% if tab[:name] == 'IssueCustomField' %>
                   <th><%=l(:field_is_for_all)%></th>
                   <th><%=l(:label_used_by)%></th>
                 <% end %>
                 <th></th>
               </tr></thead>
               <tbody>
               <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
                 <% back_url = custom_fields_path(:tab => tab[:name]) %>
                 <tr>
                   <td class="name"><%= link_to custom_field.name, edit_custom_field_path(custom_field) %></td>
                   <td><%= l(custom_field.format.label) %></td>
                   <td><%= checked_image custom_field.is_required? %></td>
                   <% if tab[:name] == 'IssueCustomField' %>
                   <td><%= checked_image custom_field.is_for_all? %></td>
                   <td><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
                   <% end %>
                   <td class="buttons">
                     <%= reorder_handle(custom_field, :url => custom_field_path(custom_field), :param => 'custom_field') %>
                     <%= delete_link custom_field_path(custom_field) %>
                   </td>
                 </tr>
-              <% end; reset_cycle %>
+              <% end %>
               </tbody>
             </table>

app/views/enumerations/index.html.erb 0 -1

             <h2><%=l(:label_enumerations)%></h2>
             <% Enumeration.get_subclasses.each do |klass| %>
             <h3><%= l(klass::OptionName) %></h3>
             <% enumerations = klass.shared %>
             <% if enumerations.any? %>
             <table class="list enumerations"><thead>
             <tr>
                 <th><%= l(:field_name) %></th>
                 <th><%= l(:field_is_default) %></th>
                 <th><%= l(:field_active) %></th>
                 <th></th>
             </tr></thead>
             <% enumerations.each do |enumeration| %>
             <tr>
                 <td class="name"><%= link_to enumeration, edit_enumeration_path(enumeration) %></td>
                 <td class="tick"><%= checked_image enumeration.is_default? %></td>
                 <td class="tick"><%= checked_image enumeration.active? %></td>
                 <td class="buttons">
                   <%= reorder_handle(enumeration, :url => enumeration_path(enumeration), :param => 'enumeration') %>
                   <%= delete_link enumeration_path(enumeration) %>
                 </td>
             </tr>
             <% end %>
             </table>
-            <% reset_cycle %>
             <% end %>
             <p><%= link_to l(:label_enumeration_new), new_enumeration_path(:type => klass.name) %></p>
             <% end %>
             <% html_title(l(:label_enumerations)) -%>
             <%= javascript_tag do %>
               $(function() { $("table.enumerations tbody").positionedItems(); });
             <% end %>

app/views/files/index.html.erb +1 -2

             <div class="contextual">
             <%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
             </div>
             <h2><%=l(:label_attachment_plural)%></h2>
             <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
             <table class="list files">
               <thead><tr>
                 <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
                 <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
                 <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %>
                 <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
                 <th>MD5</th>
                 <th></th>
               </tr></thead>
               <tbody>
             <% @containers.each do |container| %>
               <% next if container.attachments.empty? -%>
               <% if container.is_a?(Version) -%>
               <tr>
                 <th colspan="6">
                   <%= link_to(container, {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
                 </th>
               </tr>
               <% end -%>
               <% container.attachments.each do |file| %>
               <tr class="file">
                 <td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %></td>
                 <td class="created_on"><%= format_time(file.created_on) %></td>
                 <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
                 <td class="downloads"><%= file.downloads %></td>
                 <td class="digest"><%= file.digest %></td>
                 <td class="buttons">
                 <%= link_to(image_tag('delete.png'), attachment_path(file),
                                                      :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
                 </td>
               </tr>
-              <% end
+              <% end %>
-              reset_cycle %>
             <% end %>
               </tbody>
             </table>
             <% html_title(l(:label_attachment_plural)) -%>

app/views/issues/_list.html.erb 0 -1

             <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
             <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
             <div class="autoscroll">
             <table class="list issues <%= sort_css_classes %>">
               <thead>
                 <tr>
                   <th class="checkbox hide-when-print">
                     <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
                   </th>
                   <% query.inline_columns.each do |column| %>
                     <%= column_header(column) %>
                   <% end %>
                 </tr>
               </thead>
               <tbody>
               <% grouped_issue_list(issues, @query, @issue_count_by_group) do |issue, level, group_name, group_count, group_totals| -%>
               <% if group_name %>
-                <% reset_cycle %>
                 <tr class="group open">
                   <td colspan="<%= query.inline_columns.size + 1 %>">
                     <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                     <span class="name"><%= group_name %></span> <span class="count"><%= group_count %></span> <span class="totals"><%= group_totals %></span>
                     <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
                                          "toggleAllRowGroups(this)", :class => 'toggle-all') %>
                   </td>
                 </tr>
               <% end %>
               <tr id="issue-<%= issue.id %>" class="hascontextmenu <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
                 <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
                 <%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %>
               </tr>
               <% @query.block_columns.each do |column|
                    if (text = column_content(column, issue)) && text.present? -%>
               <tr class="<%= current_cycle %>">
                 <td colspan="<%= @query.inline_columns.size + 1 %>" class="<%= column.css_classes %>"><%= text %></td>
               </tr>
               <% end -%>
               <% end -%>
               <% end -%>
               </tbody>
             </table>
             </div>
             <% end -%>

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

             <% roles = Role.find_all_givable %>
             <p><%= link_to l(:label_add_projects), new_principal_membership_path(principal), :remote => true, :class => "icon icon-add" %></p>
             <% if principal.memberships.any? %>
             <table class="list memberships">
               <thead><tr>
                 <th><%= l(:label_project) %></th>
                 <th><%= l(:label_role_plural) %></th>
                 <th style="width:15%"></th>
                   <%= call_table_header_hook principal %>
               </tr></thead>
               <tbody>
               <% principal.memberships.preload(:member_roles => :role).each do |membership| %>
               <% next if membership.new_record? %>
               <tr id="member-<%= membership.id %>" class="class">
               <td class="project name">
                 <%= link_to_project membership.project %>
               </td>
               <td class="roles">
                 <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
                 <%= form_for(:membership, :remote => true,
                              :url => principal_membership_path(principal, membership), :method => :put,
                              :html => {:id => "member-#{membership.id}-roles-form",
                                        :style => 'display:none;'}) do %>
                     <p><% roles.each do |role| %>
                     <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
                                                                        :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?},
                                                                        :id => nil %> <%=h role %></label><br />
                     <% end %></p>
                     <%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %>
                     <p><%= submit_tag l(:button_change) %>
                     <%= link_to_function l(:button_cancel),
                                          "$('#member-#{membership.id}-roles').show(); $('#member-#{membership.id}-roles-form').hide(); return false;"
                         %></p>
                 <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function l(:button_edit),
                                        "$('#member-#{membership.id}-roles').hide(); $('#member-#{membership.id}-roles-form').show(); return false;",
                                        :class => 'icon icon-edit'
                       %>
                   <%= delete_link principal_membership_path(principal, membership), :remote => true if membership.deletable? %>
               </td>
                   <%= call_table_row_hook principal, membership %>
               </tr>
-              <% end; reset_cycle %>
+              <% end %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>

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

             <% roles = Role.find_all_givable
                members = @project.memberships.active.sorted.to_a %>
             <p><%= link_to l(:label_member_new), new_project_membership_path(@project), :remote => true, :class => "icon icon-add" %></p>
             <% if members.any? %>
             <table class="list members">
               <thead>
                 <tr>
                   <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
                   <th><%= l(:label_role_plural) %></th>
                   <th style="width:15%"></th>
                   <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
                 </tr>
               </thead>
               <tbody>
               <% members.each do |member| %>
               <% next if member.new_record? %>
               <tr id="member-<%= member.id %>" class="member">
               <td class="name icon icon-<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
               <td class="roles">
                 <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
                   <%= form_for(member,
                                {:as => :membership, :remote => true,
                                 :url => membership_path(member),
                                 :method => :put,
                                 :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
                          ) do |f| %>
                     <p>
                       <% roles.each do |role| %>
                       <label>
                         <%= check_box_tag('membership[role_ids][]',
                                           role.id, member.roles.include?(role),
                                           :id => nil,
                                           :disabled => !member.role_editable?(role)) %> <%= role %>
                       </label><br />
                       <% end %>
                     </p>
                     <%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %>
                     <p>
                       <%= submit_tag l(:button_save), :class => "small" %>
                       <%= link_to_function(l(:button_cancel),
                                            "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;") %>
                     </p>
                   <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function l(:button_edit),
                                        "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
                                        :class => 'icon icon-edit' %>
                   <%= delete_link membership_path(member),
                                   :remote => true,
                                   :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
               </td>
               <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
               </tr>
-            <% end; reset_cycle %>
+            <% end %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>

app/views/projects/settings/_versions.html.erb +1 -1

             <%= form_tag(settings_project_path(@project, :tab => 'versions'), :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label for='status'><%= l(:field_status) %> :</label>
             <%= select_tag 'version_status', options_for_select([[l(:label_all), '']] + Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]}, @version_status), :onchange => "this.form.submit(); return false;"  %>
             <label for='name'><%= l(:label_version) %>:</label>
             <%= text_field_tag 'version_name', @version_name, :size => 30 %>
             <%= submit_tag l(:button_apply), :name => nil %>
             <%= link_to l(:button_clear), settings_project_path(@project, :tab => 'versions'), :class => 'icon icon-reload' %>
             </fieldset>
             <% end %>
             <% if @versions.present? %>
             <table class="list versions">
               <thead><tr>
                 <th><%= l(:label_version) %></th>
                 <th><%= l(:field_effective_date) %></th>
                 <th><%= l(:field_description) %></th>
                 <th><%= l(:field_status) %></th>
                 <th><%= l(:field_sharing) %></th>
                 <th><%= l(:label_wiki_page) %></th>
                 <th style="width:15%"></th>
                 </tr></thead>
               <tbody>
             <% @versions.sort.each do |version| %>
                 <tr class="version <%=h version.status %> <%= 'shared' if version.project != @project %>">
                 <td class="name <%= 'icon icon-shared' if version.project != @project %>"><%= link_to_version version %></td>
                 <td class="date"><%= format_date(version.effective_date) %></td>
                 <td class="description"><%= version.description %></td>
                 <td class="status"><%= l("version_status_#{version.status}") %></td>
                 <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
                 <td><%= link_to_if_authorized(version.wiki_page_title, {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td>
                 <td class="buttons">
                   <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %>
                     <%= link_to l(:button_edit), edit_version_path(version), :class => 'icon icon-edit' %>
                     <%= delete_link version_path(version) %>
                   <% end %>
                  </td>
                 </tr>
-            <% end; reset_cycle %>
+            <% end %>
                 </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <div class="contextual">
             <% if @versions.any? %>
               <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
             <% end %>
             </div>
             <p><%= link_to l(:label_version_new), new_project_version_path(@project, :back_url => ''), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %></p>

app/views/reports/_details.html.erb +1 -2

             <% if @statuses.empty? or rows.empty? %>
                 <p><i><%=l(:label_no_data)%></i></p>
             <% else %>
             <table class="list issue-report">
             <thead><tr>
             <th></th>
             <% for status in @statuses %>
             <th><%= status.name %></th>
             <% end %>
             <th><strong><%=l(:label_open_issues_plural)%></strong></th>
             <th><strong><%=l(:label_closed_issues_plural)%></strong></th>
             <th><strong><%=l(:label_total)%></strong></th>
             </tr></thead>
             <tbody>
             <% for row in rows %>
             <tr>
               <td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row) %></td>
               <% for status in @statuses %>
                 <td><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %></td>
               <% end %>
               <td><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td>
               <td><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td>
               <td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td>
             </tr>
             <% end %>
             </tbody>
             </table>
-            <% end
+            <% end %>
-              reset_cycle %>

app/views/reports/_simple.html.erb +1 -2

             <% if @statuses.empty? or rows.empty? %>
                 <p><i><%=l(:label_no_data)%></i></p>
             <% else %>
             <table class="list issue-report">
             <thead><tr>
             <th></th>
             <th><%=l(:label_open_issues_plural)%></th>
             <th><%=l(:label_closed_issues_plural)%></th>
             <th><%=l(:label_total)%></th>
             </tr></thead>
             <tbody>
             <% for row in rows %>
             <tr>
               <td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row) %></td>
               <td><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td>
               <td><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td>
               <td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td>
             </tr>
             <% end %>
             </tbody>
             </table>
-            <% end
+            <% end %>
-              reset_cycle %>

app/views/timelog/_list.html.erb 0 -1

             <%= form_tag({}, :data => {:cm_url => time_entries_context_menu_path}) do -%>
             <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
             <div class="autoscroll">
             <table class="list time-entries">
             <thead>
               <tr>
                 <th class="checkbox hide-when-print">
                   <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
                     :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
                 </th>
                 <% @query.inline_columns.each do |column| %>
                   <%= column_header(column) %>
                 <% end %>
                 <th></th>
               </tr>
             </thead>
             <tbody>
             <% grouped_query_results(entries, @query, @entry_count_by_group) do |entry, group_name, group_count, group_totals| -%>
               <% if group_name %>
-                <% reset_cycle %>
                 <tr class="group open">
                   <td colspan="<%= @query.inline_columns.size + 2 %>">
                     <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                     <span class="name"><%= group_name %></span>
                     <% if group_count %>
                     <span class="count"><%= group_count %></span>
                     <% end %>
                     <span class="totals"><%= group_totals %></span>
                     <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
                                          "toggleAllRowGroups(this)", :class => 'toggle-all') %>
                   </td>
                 </tr>
               <% end %>
               <tr id="time-entry-<%= entry.id %>" class="time-entry hascontextmenu">
                 <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
                 <%= raw @query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, entry)}</td>"}.join %>
                 <td class="buttons">
                 <% if entry.editable_by?(User.current) -%>
                     <%= link_to l(:button_edit), edit_time_entry_path(entry),
                                 :title => l(:button_edit),
                                 :class => 'icon-only icon-edit' %>
                     <%= link_to l(:button_delete), time_entry_path(entry),
                                 :data => {:confirm => l(:text_are_you_sure)},
                                 :method => :delete,
                                 :title => l(:button_delete),
                                 :class => 'icon-only icon-del' %>
                 <% end -%>
                 </td>
               </tr>
               <% @query.block_columns.each do |column|
                    if (text = column_content(column, issue)) && text.present? -%>
               <tr class="<%= current_cycle %>">
                 <td colspan="<%= @query.inline_columns.size + 1 %>" class="<%= column.css_classes %>"><%= text %></td>
               </tr>
               <% end -%>
               <% end -%>
             <% end -%>
             </tbody>
             </table>
             </div>
             <% end -%>
             <%= context_menu %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages