Added related changesets messages on issue details view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1085 e93f8b46-1217-0410-a6f0-8f06a7374b81
17 years ago · b6549d763a
parent 5e2a01656d
commit b6549d763a
26 changed files with 60 additions and 8 deletions
--- a/app/views/issues/_changesets.rhtml
+++ b/app/views/issues/_changesets.rhtml
@ -0,0 +1,8 @@
+<ul>
+<% changesets.each do |changeset| %>
+    <li class="<%= cycle('odd', 'even') %>"><%= link_to("#{l(:label_revision)} #{changeset.revision}",
+                    :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision) %><br />
+        <em><%= changeset.committer %>, <%= format_time(changeset.committed_on) %></em>
+    <%= textilizable(changeset, :comments) %></li>
+<% end %>
+</ul>
--- a/app/views/issues/_pdf.rfpdf
+++ b/app/views/issues/_pdf.rfpdf
@ -66,8 +66,24 @@
 	pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)

    pdf.Ln
-
-    pdf.SetFontStyle('B',9)
+    
+    if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project)
+    	pdf.SetFontStyle('B',9)
+	    pdf.Cell(190,5, l(:label_associated_revisions), "B")
+	    pdf.Ln	
+		for changeset in @issue.changesets
+			pdf.SetFontStyle('B',8)
+		    pdf.Cell(190,5, format_time(changeset.committed_on) + " - " + changeset.committer)
+		    pdf.Ln
+			unless changeset.comments.blank?
+				pdf.SetFontStyle('',8)
+				pdf.MultiCell(190,5, changeset.comments)
+			end		
+			pdf.Ln
+		end
+	end
+	
+	pdf.SetFontStyle('B',9)
    pdf.Cell(190,5, l(:label_history), "B")
    pdf.Ln	
 	for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@ -57,12 +57,6 @@ end %>
 </table>
 <hr />

-<% if @issue.changesets.any? %>
-<div style="float:right;">
-  <em><%= l(:label_revision_plural) %>: <%= @issue.changesets.collect{|changeset| link_to(changeset.revision, :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision)}.join(", ") %></em>
-</div>
-<% end %>
-
 <p><strong><%=l(:field_description)%></strong></p>
 <div class="wiki">
 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
@ -81,6 +75,13 @@ end %>

 </div>

+<% if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @project) %>
+<div id="issue-changesets">
+<h3><%=l(:label_associated_revisions)%></h3>
+<%= render :partial => 'changesets', :locals => { :changesets => @issue.changesets} %>
+</div>
+<% end %>
+
 <% if @journals.any? %>
 <div id="history">
 <h3><%=l(:label_history)%></h3>
--- a/lang/bg.yml
+++ b/lang/bg.yml
@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/cs.yml
+++ b/lang/cs.yml
@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/de.yml
+++ b/lang/de.yml
@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/en.yml
+++ b/lang/en.yml
@ -359,6 +359,7 @@ label_modification: %d change
 label_modification_plural: %d changes
 label_revision: Revision
 label_revision_plural: Revisions
+label_associated_revisions: Associated revisions
 label_added: added
 label_modified: modified
 label_deleted: deleted
--- a/lang/es.yml
+++ b/lang/es.yml
@ -564,3 +564,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/fi.yml
+++ b/lang/fi.yml
@ -566,3 +566,4 @@ default_activity_development: Kehitys
 enumeration_issue_priorities: Tapahtuman prioriteetit
 enumeration_doc_categories: Dokumentin luokat
 enumeration_activities: Aktiviteetit (ajan seuranta)
+label_associated_revisions: Associated revisions
--- a/lang/fr.yml
+++ b/lang/fr.yml
@ -359,6 +359,7 @@ label_modification: %d modification
 label_modification_plural: %d modifications
 label_revision: Révision
 label_revision_plural: Révisions
+label_associated_revisions: Révisions associées
 label_added: ajouté
 label_modified: modifié
 label_deleted: supprimé
--- a/lang/he.yml
+++ b/lang/he.yml
@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/it.yml
+++ b/lang/it.yml
@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/ja.yml
+++ b/lang/ja.yml
@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/ko.yml
+++ b/lang/ko.yml
@ -561,3 +561,4 @@ button_update: 변경사항기록
 label_change_properties: 속성 변경
 label_general: 일반
 label_repository_plural: 저장소들
+label_associated_revisions: Associated revisions
--- a/lang/lt.yml
+++ b/lang/lt.yml
@ -562,3 +562,4 @@ text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 label_repository_plural: Repositories
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+label_associated_revisions: Associated revisions
--- a/lang/nl.yml
+++ b/lang/nl.yml
@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/pl.yml
+++ b/lang/pl.yml
@ -561,3 +561,4 @@ button_update: Uaktualnij
 label_change_properties: Zmień właściwości
 label_general: Ogólne
 label_repository_plural: Repozytoria
+label_associated_revisions: Associated revisions
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/pt.yml
+++ b/lang/pt.yml
@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/ro.yml
+++ b/lang/ro.yml
@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/ru.yml
+++ b/lang/ru.yml
@ -560,3 +560,4 @@ button_update: Обновить
 label_change_properties: Изменить свойства
 label_general: Общее
 label_repository_plural: Репозитории
+label_associated_revisions: Associated revisions
--- a/lang/sr.yml
+++ b/lang/sr.yml
@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/sv.yml
+++ b/lang/sv.yml
@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@ -562,3 +562,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
+label_associated_revisions: Associated revisions
--- a/lang/zh.yml
+++ b/lang/zh.yml
@ -564,3 +564,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@ -135,6 +135,11 @@ hr { width: 100%; height: 1px; background: #ccc; border: 0;}
 textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
+
+div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em;}
+div#issue-changesets ul {list-style-position: outside; list-style-type:none; margin: 0;  padding: 0;}
+div#issue-changesets li { padding: 4px; }
+
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }