jro_apps/redmine Commit - r10848:b7d8913459ae

Code cleanup, use named routes....

Jean-Philippe Lang -

r10848:b7d8913459ae

parent child

Context file:

r10848:b7d8913459ae

Collapse all files

app/views/roles/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_role_new), new_role_path, :class => 'icon icon-add' %>
-            <%= link_to l(:label_permissions_report), {:action => 'permissions'}, :class => 'icon icon-summary' %>
+            <%= link_to l(:label_permissions_report), permissions_roles_path, :class => 'icon icon-summary' %>
             </div>
             <h2><%=l(:label_role_plural)%></h2>
             <table class="list">
               <thead><tr>
                 <th><%=l(:label_role)%></th>
                 <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% for role in @roles %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), edit_role_path(role))) %></td>
               <td align="center" style="width:15%;">
               <% unless role.builtin? %>
                 <%= reorder_links('role', {:action => 'update', :id => role}, :put) %>
               <% end %>
               </td>
               <td class="buttons">
                 <%= link_to l(:button_copy), new_role_path(:copy => role), :class => 'icon icon-copy' %>
                 <%= delete_link role_path(role) unless role.builtin? %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @role_pages %></p>
             <% html_title(l(:label_role_plural)) -%>

app/views/trackers/fields.html.erb +1 -1

             <h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%= l(:field_summary) %></h2>
             <% if @trackers.any? %>
-              <%= form_tag({}) do %>
+              <%= form_tag fields_trackers_path do %>
                 <div class="autoscroll">
                 <table class="list">
                 <thead>
                   <tr>
                     <th></th>
                     <% @trackers.each do |tracker| %>
                     <th>
                       <%= tracker.name %>
                       <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.tracker-#{tracker.id}')",
                                                                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                     </th>
                     <% end %>
                   </tr>
                 </thead>
                 <tbody>
                   <tr class="group open">
                     <td colspan="<%= @trackers.size + 1 %>">
                       <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                       <%= l(:field_core_fields) %>
                     </td>
                   </tr>
                   <% Tracker::CORE_FIELDS.each do |field| %>
                   <tr class="<%= cycle("odd", "even") %>">
                     <td>
                       <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.core-field-#{field}')",
                                                                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                       <%= l("field_#{field}".sub(/_id$/, '')) %>
                     </td>
                     <% @trackers.each do |tracker| %>
                     <td align="center">
                       <%= check_box_tag "trackers[#{tracker.id}][core_fields][]", field, tracker.core_fields.include?(field),
                                         :class => "tracker-#{tracker.id} core-field-#{field}" %>
                     </td>
                     <% end %>
                   </tr>
                   <% end %>
                   <% if @custom_fields.any? %>
                     <tr class="group open">
                       <td colspan="<%= @trackers.size + 1 %>">
                         <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                         <%= l(:label_custom_field_plural) %>
                       </td>
                     </tr>
                     <% @custom_fields.each do |field| %>
                     <tr class="<%= cycle("odd", "even") %>">
                       <td>
                         <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.custom-field-#{field.id}')",
                                                                             :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                         <%= field.name %>
                       </td>
                       <% @trackers.each do |tracker| %>
                       <td align="center">
                         <%= check_box_tag "trackers[#{tracker.id}][custom_field_ids][]", field.id, tracker.custom_fields.include?(field),
                                           :class => "tracker-#{tracker.id} custom-field-#{field.id}" %>
                       </td>
                       <% end %>
                     </tr>
                     <% end %>
                   <% end %>
                 </tbody>
                 </table>
                 </div>
                 <p><%= submit_tag l(:button_save) %></p>
                 <% @trackers.each do |tracker| %>
                   <%= hidden_field_tag "trackers[#{tracker.id}][core_fields][]", '' %>
                   <%= hidden_field_tag "trackers[#{tracker.id}][custom_field_ids][]", '' %>
                 <% end %>
               <% end %>
             <% else %>
               <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <% html_title l(:field_summary) %>

app/views/trackers/index.html.erb +11 -3

             <div class="contextual">
             <%= link_to l(:label_tracker_new), new_tracker_path, :class => 'icon icon-add' %>
-            <%= link_to l(:field_summary), {:action => 'fields'}, :class => 'icon icon-summary' %>
+            <%= link_to l(:field_summary), fields_trackers_path, :class => 'icon icon-summary' %>
             </div>
             <h2><%=l(:label_tracker_plural)%></h2>
             <table class="list">
               <thead><tr>
               <th><%=l(:label_tracker)%></th>
               <th></th>
               <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% for tracker in @trackers %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to h(tracker.name), edit_tracker_path(tracker) %></td>
-              <td align="center"><% unless tracker.workflow_rules.count > 0 %><span class="icon icon-warning"><%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), {:controller => 'workflows', :action => 'edit', :tracker_id => tracker} %>)</span><% end %></td>
+              <td align="center">
-              <td align="center" style="width:15%;"><%= reorder_links('tracker', {:action => 'update', :id => tracker}, :put) %></td>
+                <% unless tracker.workflow_rules.count > 0 %>
+                  <span class="icon icon-warning">
+                    <%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), workflows_edit_path(:tracker_id => tracker) %>)
+                  </span>
+                <% end %>
+              </td>
+              <td align="center" style="width:15%;">
+                <%= reorder_links('tracker', {:action => 'update', :id => tracker}, :put) %>
+              </td>
               <td class="buttons">
                 <%= delete_link tracker_path(tracker) %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @tracker_pages %></p>
             <% html_title(l(:label_tracker_plural)) -%>

app/views/users/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_user_new), new_user_path, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_user_plural)%></h2>
-            <%= form_tag({}, :method => :get) do %>
+            <%= form_tag(users_path, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label for='status'><%= l(:field_status) %>:</label>
             <%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             <% if @groups.present? %>
             <label for='group_id'><%= l(:label_group) %>:</label>
             <%= select_tag 'group_id', content_tag('option') + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
             <% end %>
             <label for='name'><%= l(:label_user) %>:</label>
             <%= text_field_tag 'name', params[:name], :size => 30 %>
             <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
             <%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
             </fieldset>
             <% end %>
             &nbsp;
             <div class="autoscroll">
             <table class="list">
               <thead><tr>
               <%= sort_header_tag('login', :caption => l(:field_login)) %>
               <%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
               <%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
               <%= sort_header_tag('mail', :caption => l(:field_mail)) %>
               <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
               <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
               <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for user in @users -%>
               <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
               <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
               <td class="firstname"><%= h(user.firstname) %></td>
               <td class="lastname"><%= h(user.lastname) %></td>
               <td class="email"><%= mail_to(h(user.mail)) %></td>
               <td align="center"><%= checked_image user.admin? %></td>
               <td class="created_on" align="center"><%= format_time(user.created_on) %></td>
               <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
                 <td class="buttons">
                   <%= change_status_link(user) %>
                   <%= delete_link user_path(user, :back_url => users_path(params)) unless User.current == user %>
                 </td>
               </tr>
             <% end -%>
               </tbody>
             </table>
             </div>
             <p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
             <% html_title(l(:label_user_plural)) -%>

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