Skip to content

O
OHR Support
Commit 6862b979 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Removed IssuesController#history, all changes are now displayed on issues/show… 

Removed IssuesController#history, all changes are now displayed on issues/show (not only the last 15).
Added anchor links to issue notes, eg: /issues/show/1#note-3

git-svn-id: http://redmine.rubyforge.org/svn/trunk@613 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 64e91b2e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 22 deletions
app/controllers/issues_controller.rb
View file @ 6862b979
......@@ -37,13 +37,7 @@ class IssuesController < ApplicationController
def show
@status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
@custom_values = @issue.custom_values.find(:all, :include => :custom_field)
@journals_count = @issue.journals.count
@journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "#{Journal.table_name}.created_on desc")
end
def history
@journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on desc")
@journals_count = @journals.length
end
def export_pdf
......
app/views/issues/_history.rhtml
View file @ 6862b979
<% note_id = journals.length %>
<% for journal in journals %>
<h4><%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
<h4><div style="float:right;"><%= link_to "##{note_id}", :anchor => "note-#{note_id}" %></div>
<%= content_tag('a', '', :name => "note-#{note_id}")%>
<%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
<ul>
<% for detail in journal.details %>
<li><%= show_detail(detail) %></li>
<% end %>
</ul>
<% if journal.notes? %>
<%= textilizable(journal.notes) %>
<% end %>
<%= textilizable(journal.notes) unless journal.notes.blank? %>
<% note_id -= 1 %>
<% end %>
app/views/issues/history.rhtml deleted 100644 → 0
View file @ 64e91b2e
<h3><%=l(:label_history)%></h3>
<div id="history">
<%= render :partial => 'history', :locals => { :journals => @journals } %>
</div>
<br />
<p><%= link_to l(:button_back), :action => 'show', :id => @issue %></p>
\ No newline at end of file
app/views/issues/show.rhtml
View file @ 6862b979
......@@ -81,14 +81,10 @@ end %>
</div>
<% end %>
<% if @journals_count > 0 %>
<% if @journals.any? %>
<div id="history" class="box">
<h3><%=l(:label_history)%>
<% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3>
<h3><%=l(:label_history)%></h3>
<%= render :partial => 'history', :locals => { :journals => @journals } %>
<% if @journals_count > @journals.length %>
<p><center><small><%= link_to l(:label_change_view_all), :action => 'history', :id => @issue %></small></center></p>
<% end %>
</div>
<% end %>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment