jro_apps/redmine Commit - r10842:8eea999ca676

Code cleanup, use named routes....

Jean-Philippe Lang -

r10842:8eea999ca676

parent child

Context file:

r10842:8eea999ca676

Collapse all files

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

             <h2><%= l(:label_board_plural) %></h2>
             <table class="list boards">
               <thead><tr>
                 <th><%= l(:label_board) %></th>
                 <th><%= l(:label_topic_plural) %></th>
                 <th><%= l(:label_message_plural) %></th>
                 <th><%= l(:label_message_last) %></th>
               </tr></thead>
               <tbody>
             <% Board.board_tree(@boards) do |board, level| %>
               <tr class="<%= cycle 'odd', 'even' %>">
                 <td style="padding-left: <%= level * 18 %>px;">
-                  <%= link_to h(board.name), {:action => 'show', :id => board}, :class => "board"  %><br />
+                  <%= link_to h(board.name), project_board_path(board.project, board), :class => "board" %><br />
                   <%=h board.description %>
                 </td>
                 <td class="topic-count"><%= board.topics_count %></td>
                 <td class="message-count"><%= board.messages_count %></td>
                 <td class="last-message">
                   <% if board.last_message %>
                   <%= authoring board.last_message.created_on, board.last_message.author %><br />
                   <%= link_to_message board.last_message %>
                   <% end %>
                 </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
             <% end %>
             <% content_for :header_tags do %>
               <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
             <% end %>
             <% html_title l(:label_board_plural) %>

app/views/boards/show.html.erb +8 -8

             <%= board_breadcrumb(@board) %>
             <div class="contextual">
-            <%= link_to_if_authorized l(:label_message_new),
+            <%= link_to l(:label_message_new),
-                                      {:controller => 'messages', :action => 'new', :board_id => @board},
+                        new_board_message_path(@board),
                         :class => 'icon icon-add',
-                                      :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' %>
+                        :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.allowed_to?(:add_messages, @board.project) %>
             <%= watcher_tag(@board, User.current) %>
             </div>
             <div id="add-message" style="display:none;">
-            <% if authorize_for('messages', 'new') %>
+            <% if User.current.allowed_to?(:add_messages, @board.project) %>
-            <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
+            <h2><%= link_to h(@board.name), project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h2>
-            <%= form_for @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+            <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
               <%= render :partial => 'messages/form', :locals => {:f => f} %>
               <p><%= submit_tag l(:button_create) %>
-              <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %> |
+              <%= preview_link(preview_board_message_path(@board), 'message-form') %> |
               <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' %></p>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% end %>
             </div>
             <h2><%=h @board.name %></h2>
             <p class="subtitle"><%=h @board.description %></p>
             <% if @topics.any? %>
             <table class="list messages">
               <thead><tr>
                 <th><%= l(:field_subject) %></th>
                 <th><%= l(:field_author) %></th>
                 <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
                 <%= sort_header_tag('replies', :caption => l(:label_reply_plural)) %>
                 <%= sort_header_tag('updated_on', :caption => l(:label_message_last)) %>
               </tr></thead>
               <tbody>
               <% @topics.each do |topic| %>
                 <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-                  <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic } %></td>
+                  <td class="subject"><%= link_to h(topic.subject), board_message_path(@board, topic) %></td>
                   <td class="author"><%= link_to_user(topic.author) %></td>
                   <td class="created_on"><%= format_time(topic.created_on) %></td>
                   <td class="reply-count"><%= topic.replies_count %></td>
                   <td class="last_message">
                     <% if topic.last_reply %>
                     <%= authoring topic.last_reply.created_on, topic.last_reply.author %><br />
                     <%= link_to_message topic.last_reply %>
                     <% end %>
                   </td>
                 </tr>
               <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
             <% end %>
             <% html_title @board.name %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
             <% end %>

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