jro_apps/redmine Commit - r10838:bda9b98a562e

Code cleanup, use named routes....

Jean-Philippe Lang -

r10838:bda9b98a562e

parent child

Context file:

r10838:bda9b98a562e

Collapse all files

app/models/issue.rb +5 0

                 end
               end
+              # Returns true if user or current user is allowed to edit or add a note to the issue
+              def editable?(user=User.current)
+                user.allowed_to?(:edit_issues, project) || user.allowed_to?(:add_issue_notes, project)
+              end
               def initialize(attributes=nil, *args)
                 super
                 if new_record?

app/views/issues/_action_menu.html.erb +2 -2

             <div class="contextual">
-            <%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
+            <%= link_to l(:button_update), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
             <%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
             <%= watcher_tag(@issue, User.current) %>
-            <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, :class => 'icon icon-copy' %>
+            <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %>
             <%= link_to l(:button_delete), issue_path(@issue), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %>
             </div>

app/views/issues/_list_simple.html.erb +2 -2

                 <tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
                   <td class="id">
                     <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %>
-                    <%= link_to(h(issue.id), :controller => 'issues', :action => 'show', :id => issue) %>
+                    <%= link_to issue.id, issue_path(issue) %>
                   </td>
                   <td class="project"><%= link_to_project(issue.project) %></td>
                   <td class="tracker"><%=h issue.tracker %></td>
                   <td class="subject">
-                    <%= link_to h(truncate(issue.subject, :length => 60)), :controller => 'issues', :action => 'show', :id => issue %> (<%=h issue.status %>)
+                    <%= link_to truncate(issue.subject, :length => 60), issue_path(issue) %> (<%=h issue.status %>)
                   </td>
                 </tr>
                 <% end %>

app/views/issues/show.html.erb +3 -7

                 end
               end
               if User.current.allowed_to?(:view_time_entries, @project)
-                rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? (link_to l_hours(@issue.total_spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-"), :class => 'spent-time'
+                rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), project_issue_time_entries_path(@project, @issue)) : "-"), :class => 'spent-time'
               end
             end %>
             <%= render_custom_fields_rows(@issue) %>
             <% if @issue.description? %>
             <div class="description">
               <div class="contextual">
-              <%= link_to l(:button_quote),
+              <%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
-                          {:controller => 'journals', :action => 'new', :id => @issue},
-                          :remote => true,
-                          :method => 'post',
-                          :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
               </div>
               <p><strong><%=l(:field_description)%></strong></p>
             <%= render :partial => 'action_menu' %>
             <div style="clear: both;"></div>
-            <% if authorize_for('issues', 'edit') %>
+            <% if @issue.editable? %>
               <div id="update" style="display:none;">
               <h3><%= l(:button_update) %></h3>
               <%= render :partial => 'edit' %>

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