jro_apps/redmine Commit - r52:42181112ff73

0

redmine/app/models/journal.rb created 644 +22 0

@@ -0,0 +1,22
	1	# redMine - project management software
	2	# Copyright (C) 2006 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class Journal < ActiveRecord::Base
	19	belongs_to :journalized, :polymorphic => true
	20	belongs_to :user
	21	has_many :details, :class_name => "JournalDetail", :dependent => true
	22	end

0

redmine/app/models/journal_detail.rb created 644 +20 0

@@ -0,0 +1,20
	1	# redMine - project management software
	2	# Copyright (C) 2006 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class JournalDetail < ActiveRecord::Base
	19	belongs_to :journal
	20	end

0

redmine/app/views/issues/_history.rhtml created 644 +11 0

@@ -0,0 +1,11
	1	<% for journal in journals %>
	2	<h4><%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
	3	<ul>
	4	<% for detail in journal.details %>
	5	<li><%= show_detail(detail) %></li>
	6	<% end %>
	7	</ul>
	8	<% if journal.notes? %>
	9	<%= simple_format auto_link journal.notes %>
	10	<% end %>
	11	<% end %>

0

redmine/app/views/issues/history.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<h3><%=l(:label_history)%></h3>
	2	<div id="history">
	3	<%= render :partial => 'history', :locals => { :journals => @journals } %>
	4	</div>
	5	<br />
	6	<p><%= link_to l(:button_back), :action => 'show', :id => @issue %></p> No newline at end of file

0

redmine/app/views/mailer/issue_edit_de.rhtml created 644 +8 0

@@ -0,0 +1,8
	1	Issue #<%= @issue.id %> has been updated.
	2	<%= @journal.user.name %>
	3	<% for detail in @journal.details %>
	4	<%= show_detail(detail) %>
	5	<% end %>
	6	<%= @journal.notes if @journal.notes? %>
	7	----------------------------------------
	8	<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %> No newline at end of file

0

redmine/app/views/mailer/issue_edit_en.rhtml created 644 +8 0

@@ -0,0 +1,8
	1	Issue #<%= @issue.id %> has been updated.
	2	<%= @journal.user.name %>
	3	<% for detail in @journal.details %>
	4	<%= show_detail(detail) %>
	5	<% end %>
	6	<%= @journal.notes if @journal.notes? %>
	7	----------------------------------------
	8	<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %> No newline at end of file

0

redmine/app/views/mailer/issue_edit_es.rhtml created 644 +8 0

@@ -0,0 +1,8
	1	Issue #<%= @issue.id %> has been updated.
	2	<%= @journal.user.name %>
	3	<% for detail in @journal.details %>
	4	<%= show_detail(detail) %>
	5	<% end %>
	6	<%= @journal.notes if @journal.notes? %>
	7	----------------------------------------
	8	<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %> No newline at end of file

0

redmine/app/views/mailer/issue_edit_fr.rhtml created 644 +8 0

@@ -0,0 +1,8
	1	La demande #<%= @issue.id %> a été mise à jour.
	2	<%= @journal.user.name %> - <%= format_date(@journal.created_on) %>
	3	<% for detail in @journal.details %>
	4	<%= show_detail(detail) %>
	5	<% end %>
	6	<%= journal.notes if journal.notes? %>
	7	----------------------------------------
	8	<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %> No newline at end of file

0

redmine/db/migrate/007_create_journals.rb created 644 +54 0

@@ -0,0 +1,54
	1	class CreateJournals < ActiveRecord::Migration
	2
	3	# model removed, but needed for data migration
	4	class IssueHistory < ActiveRecord::Base; belongs_to :issue; end
	5
	6	def self.up
	7	create_table :journals, :force => true do \|t\|
	8	t.column "journalized_id", :integer, :default => 0, :null => false
	9	t.column "journalized_type", :string, :limit => 30, :default => "", :null => false
	10	t.column "user_id", :integer, :default => 0, :null => false
	11	t.column "notes", :text
	12	t.column "created_on", :datetime, :null => false
	13	end
	14	create_table :journal_details, :force => true do \|t\|
	15	t.column "journal_id", :integer, :default => 0, :null => false
	16	t.column "property", :string, :limit => 30, :default => "", :null => false
	17	t.column "prop_key", :string, :limit => 30, :default => "", :null => false
	18	t.column "old_value", :string
	19	t.column "value", :string
	20	end
	21
	22	# indexes
	23	add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
	24	add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
	25
	26	Permission.create :controller => "issues", :action => "history", :description => "label_history", :sort => 1006, :is_public => true, :mail_option => 0, :mail_enabled => 0
	27
	28	# data migration
	29	IssueHistory.find(:all, :include => :issue).each {\|h\|
	30	j = Journal.new(:journalized => h.issue, :user_id => h.author_id, :notes => h.notes, :created_on => h.created_on)
	31	j.details << JournalDetail.new(:property => 'attr', :prop_key => 'status_id', :value => h.status_id)
	32	j.save
	33	}
	34
	35	drop_table :issue_histories
	36	end
	37
	38	def self.down
	39	drop_table :journal_details
	40	drop_table :journals
	41
	42	create_table "issue_histories", :force => true do \|t\|
	43	t.column "issue_id", :integer, :default => 0, :null => false
	44	t.column "status_id", :integer, :default => 0, :null => false
	45	t.column "author_id", :integer, :default => 0, :null => false
	46	t.column "notes", :text, :default => ""
	47	t.column "created_on", :timestamp
	48	end
	49
	50	add_index "issue_histories", ["issue_id"], :name => "issue_histories_issue_id"
	51
	52	Permission.find(:first, :conditions => ["controller=? and action=?", 'issues', 'history']).destroy
	53	end
	54	end

0

redmine/app/controllers/application.rb +20 -1

@@ -41,7 +41,7 class ApplicationController < ActionController::Base
41	if self.logged_in_user and self.logged_in_user.language and !self.logged_in_user.language.empty? and GLoc.valid_languages.include? self.logged_in_user.language.to_sym	41	if self.logged_in_user and self.logged_in_user.language and !self.logged_in_user.language.empty? and GLoc.valid_languages.include? self.logged_in_user.language.to_sym
42	self.logged_in_user.language	42	self.logged_in_user.language
43	elsif request.env['HTTP_ACCEPT_LANGUAGE']	43	elsif request.env['HTTP_ACCEPT_LANGUAGE']
44	accept_lang = ~~HTTPUtils~~.parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first	44	accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
45	if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym	45	if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
46	accept_lang	46	accept_lang
47	end	47	end
@@ -104,4 +104,23 class ApplicationController < ActionController::Base
104	session[:return_to] = nil	104	session[:return_to] = nil
105	end	105	end
106	end	106	end
		107
		108	# qvalues http header parser
		109	# code taken from webrick
		110	def parse_qvalues(value)
		111	tmp = []
		112	if value
		113	parts = value.split(/,\s*/)
		114	parts.each {\|part\|
		115	if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
		116	val = m[1]
		117	q = (m[2] or 1).to_f
		118	tmp.push([val, q])
		119	end
		120	}
		121	tmp = tmp.sort_by{\|val, q\| -q}
		122	tmp.collect!{\|val, q\| val}
		123	end
		124	return tmp
		125	end
107	end No newline at end of file	126	end

0

redmine/app/controllers/issues_controller.rb +26 -14

               def show
                 @status_options = @issue.status.workflows.find(:all, :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.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 => "journals.created_on desc")
+              end
+              def history
+                @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "journals.created_on desc")
+                @journals_count = @journals.length
               end
               def export_pdf
                   @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   begin
+                    @issue.init_journal(self.logged_in_user)
                     # Retrieve custom fields and values
                     @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                     @issue.custom_values = @custom_values
               end
               def add_note
-                unless params[:history][:notes].empty?
+                unless params[:notes].empty?
-                  @history = @issue.histories.build(params[:history])
+                  journal = @issue.init_journal(self.logged_in_user, params[:notes])
-                  @history.author_id = self.logged_in_user.id if self.logged_in_user
+                  #@history = @issue.histories.build(params[:history])
-                  @history.status = @issue.status
+                  #@history.author_id = self.logged_in_user.id if self.logged_in_user
-                  if @history.save
+                  #@history.status = @issue.status
+                  if @issue.save
                     flash[:notice] = l(:notice_successful_update)
-                    Mailer.deliver_issue_add_note(@history) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
+                    Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                     redirect_to :action => 'show', :id => @issue
                     return
                   end
               end
               def change_status
-                @history = @issue.histories.build(params[:history])
+                #@history = @issue.histories.build(params[:history])
                 @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
+                @new_status = IssueStatus.find(params[:new_status_id])
                 if params[:confirm]
                   begin
-                    @history.author_id = self.logged_in_user.id if self.logged_in_user
+                    #@history.author_id = self.logged_in_user.id if self.logged_in_user
-                    @issue.status = @history.status
+                    #@issue.status = @history.status
-                    @issue.fixed_version_id = (params[:issue][:fixed_version_id])
+                    #@issue.fixed_version_id = (params[:issue][:fixed_version_id])
-                    @issue.assigned_to_id = (params[:issue][:assigned_to_id])
+                    #@issue.assigned_to_id = (params[:issue][:assigned_to_id])
-                    @issue.done_ratio = (params[:issue][:done_ratio])
+                    #@issue.done_ratio = (params[:issue][:done_ratio])
-                    @issue.lock_version = (params[:issue][:lock_version])
+                    #@issue.lock_version = (params[:issue][:lock_version])
-                    if @issue.save
+                    @issue.init_journal(self.logged_in_user, params[:notes])
+                    @issue.status = @new_status
+                    if @issue.update_attributes(params[:issue])
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                       redirect_to :action => 'show', :id => @issue

0

redmine/app/controllers/projects_controller.rb +1 0

               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
+              helper IssuesHelper
               def index
                 list

0

redmine/app/helpers/application_helper.rb +1 -1

               end
               def textilizable(text)
-                $RDM_TEXTILE_DISABLED ? text : textilize(text)
+                $RDM_TEXTILE_DISABLED ? text : RedCloth.new(text).to_html
               end
               def error_messages_for(object_name, options = {})

0

redmine/app/helpers/custom_fields_helper.rb +9 -4

               # Return a string used to display a custom value
               def show_value(custom_value)
                 return "" unless custom_value
+                format_value(custom_value.value, custom_value.custom_field.field_format)
+              end
-                case custom_value.custom_field.field_format
+              # Return a string used to display a custom value
+              def format_value(value, field_format)
+                return "" unless value
+                case field_format
                 when "date"
-                  custom_value.value.empty? ? "" : l_date(custom_value.value.to_date)
+                  value.empty? ? "" : l_date(value.to_date)
                 when "bool"
-                  l_YesNo(custom_value.value == "1")
+                  l_YesNo(value == "1")
                 else
-                  custom_value.value
+                  value
                 end
               end

0

redmine/app/helpers/ifpdf_helper.rb +5 -5

                 def Cell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')
                   @ic ||= Iconv.new('ISO-8859-1', 'UTF-8')
-                  super w,h,@ic.iconv(txt),border,ln,align,fill,link
+                  txt = begin
+                    @ic.iconv(txt)
+                  rescue
+                    txt
                   end
+                  super w,h,txt,border,ln,align,fill,link
-                def MultiCell(w,h,txt,border=0,align='J',fill=0)
-                  @ic ||= Iconv.new('ISO-8859-1', 'UTF-8')
-                  super w,h,txt,border,align,fill
                 end
                 def Footer

0

redmine/app/helpers/issues_helper.rb +55 0

@@ -16,4 +16,59
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	module IssuesHelper	18	module IssuesHelper
		19
		20	def show_detail(detail, no_html=false)
		21	case detail.property
		22	when 'attr'
		23	label = l(("field_" + detail.prop_key.to_s.gsub(/\_id$/, "")).to_sym)
		24	case detail.prop_key
		25	when 'due_date', 'start_date'
		26	value = format_date(detail.value.to_date) if detail.value
		27	old_value = format_date(detail.old_value.to_date) if detail.old_value
		28	when 'status_id'
		29	s = IssueStatus.find_by_id(detail.value) and value = s.name if detail.value
		30	s = IssueStatus.find_by_id(detail.old_value) and old_value = s.name if detail.old_value
		31	when 'assigned_to_id'
		32	u = User.find_by_id(detail.value) and value = u.name if detail.value
		33	u = User.find_by_id(detail.old_value) and old_value = u.name if detail.old_value
		34	when 'priority_id'
		35	e = Enumeration.find_by_id(detail.value) and value = e.name if detail.value
		36	e = Enumeration.find_by_id(detail.old_value) and old_value = e.name if detail.old_value
		37	when 'category_id'
		38	c = IssueCategory.find_by_id(detail.value) and value = c.name if detail.value
		39	c = IssueCategory.find_by_id(detail.old_value) and old_value = c.name if detail.old_value
		40	when 'fixed_version_id'
		41	v = Version.find_by_id(detail.value) and value = v.name if detail.value
		42	v = Version.find_by_id(detail.old_value) and old_value = v.name if detail.old_value
		43	end
		44	when 'cf'
		45	custom_field = CustomField.find_by_id(detail.prop_key)
		46	if custom_field
		47	label = custom_field.name
		48	value = format_value(detail.value, custom_field.field_format) if detail.value
		49	old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
		50	end
		51	end
		52
		53	label \|\|= detail.prop_key
		54	value \|\|= detail.value
		55	old_value \|\|= detail.old_value
		56
		57	unless no_html
		58	label = content_tag('strong', label)
		59	old_value = content_tag("i", old_value) if old_value
		60	old_value = content_tag("strike", old_value) if old_value and !value
		61	value = content_tag("i", value) if value
		62	end
		63
		64	if value
		65	if old_value
		66	label + " " + l(:text_journal_changed, old_value, value)
		67	else
		68	label + " " + l(:text_journal_set_to, value)
		69	end
		70	else
		71	label + " " + l(:text_journal_deleted) + " (#{old_value})"
		72	end
		73	end
19	end	74	end

0

redmine/app/models/issue.rb +37 -8

@@ -26,7 +26,8 class Issue < ActiveRecord::Base
26	belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'	26	belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
27	belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'	27	belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
28		28
29	has_many :histories, :class_name => 'IssueHistory', :dependent => true, :order => "issue_histories.created_on DESC", :include => :status	29	#has_many :histories, :class_name => 'IssueHistory', :dependent => true, :order => "issue_histories.created_on DESC", :include => :status
		30	has_many :journals, :as => :journalized, :dependent => true
30	has_many :attachments, :as => :container, :dependent => true	31	has_many :attachments, :as => :container, :dependent => true
31		32
32	has_many :custom_values, :dependent => true, :as => :customized	33	has_many :custom_values, :dependent => true, :as => :customized
@@ -51,8 +52,28 class Issue < ActiveRecord::Base
51	end	52	end
52	end	53	end
53		54
54	def before_create	55	#def before_create
55	build_history	56	# build_history
		57	#end
		58
		59	def before_save
		60	if @current_journal
		61	# attributes changes
		62	(Issue.column_names - %w(id description)).each {\|c\|
		63	@current_journal.details << JournalDetail.new(:property => 'attr',
		64	:prop_key => c,
		65	:old_value => @issue_before_change.send(c),
		66	:value => send(c)) unless send(c)==@issue_before_change.send(c)
		67	}
		68	# custom fields changes
		69	custom_values.each {\|c\|
		70	@current_journal.details << JournalDetail.new(:property => 'cf',
		71	:prop_key => c.custom_field_id,
		72	:old_value => @custom_values_before_change[c.custom_field_id],
		73	:value => c.value) unless @custom_values_before_change[c.custom_field_id]==c.value
		74	}
		75	@current_journal.save unless @current_journal.details.empty? and @current_journal.notes.empty?
		76	end
56	end	77	end
57		78
58	def long_id	79	def long_id
@@ -64,11 +85,19 class Issue < ActiveRecord::Base
64	return nil	85	return nil
65	end	86	end
66		87
		88	def init_journal(user, notes = "")
		89	@current_journal \|\|= Journal.new(:journalized => self, :user => user, :notes => notes)
		90	@issue_before_change = self.clone
		91	@custom_values_before_change = {}
		92	self.custom_values.each {\|c\| @custom_values_before_change.store c.custom_field_id, c.value }
		93	@current_journal
		94	end
		95
67	private	96	private
68	# Creates an history for the issue	97	# Creates an history for the issue
69	def build_history	98	#def build_history
70	@history = self.histories.build	99	# @history = self.histories.build
71	@history.status = self.status	100	# @history.status = self.status
72	@history.author = self.author	101	# @history.author = self.author
73	end	102	#end
74	end	103	end

0

redmine/app/models/mailer.rb +4 -10

             class Mailer < ActionMailer::Base
-              def issue_change_status(issue)
+              def issue_add(issue)
                 # Sends to all project members
                 @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
                 @from           = $RDM_MAIL_FROM
                 @body['issue']  = issue
               end
-              def issue_add(issue)
+              def issue_edit(journal)
                 # Sends to all project members
+                issue = journal.journalized
                 @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
                 @from           = $RDM_MAIL_FROM
                 @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
                 @body['issue']  = issue
-              end
+                @body['journal']= journal
-              def issue_add_note(history)
-                # Sends to all project members
-                @recipients     = history.issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
-                @from           = $RDM_MAIL_FROM
-                @subject        = "[#{history.issue.project.name} - #{history.issue.tracker.name} ##{history.issue.id}] #{history.issue.status.name} - #{history.issue.subject}"
-                @body['history']  = history
               end
               def lost_password(token)

0

redmine/app/views/issues/_pdf.rfpdf +14 -9

             	pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
                 pdf.Ln
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(190,5, l(:label_history), "B")
                 pdf.Ln
-            	for history in issue.histories.find(:all, :include => [:author, :status])
+            	for journal in issue.journals.find(:all, :include => :user, :order => "journals.created_on desc")
             		pdf.SetFont('Arial','B',8)
-            	    pdf.Cell(100,5, history.status.name)
+            	    pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
-            	    pdf.SetFont('Arial','',8)
+            	    pdf.Ln
-            	    pdf.Cell(20,5, format_date(history.created_on))
+            		pdf.SetFont('Arial','I',8)
-            	    pdf.Cell(70,5, history.author.name,0,0,"R")
+            		for detail in journal.details
-            	    pdf.SetFont('Arial','',8)
+            			pdf.Cell(190,5, "- " + show_detail(detail, true))
             			pdf.Ln
-            	    pdf.Cell(10,4, "") and pdf.MultiCell(180,4, history.notes) if history.notes?
+            		end
+            		if journal.notes?
+            			pdf.SetFont('Arial','',8)
+            			pdf.MultiCell(190,5, journal.notes)
             		end
             		pdf.Ln
+            	end
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(190,5, l(:label_attachment_plural), "B")
             	for attachment in issue.attachments
             		pdf.SetFont('Arial','',8)
             	    pdf.Cell(80,5, attachment.filename)
-            		pdf.Cell(20,5, human_size(attachment.filesize))
+            		pdf.Cell(20,5, human_size(attachment.filesize),0,0,"R")
-            		pdf.Cell(20,5, format_date(attachment.created_on))
+            		pdf.Cell(20,5, format_date(attachment.created_on),0,0,"R")
             		pdf.Cell(70,5, attachment.author.name,0,0,"R")
             		pdf.Ln
             	end

0

redmine/app/views/issues/change_status.rhtml +6 -5

             <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%= @issue.subject %></h2>
-            <%= error_messages_for 'history' %>
+            <%= error_messages_for 'issue' %>
             <%= start_form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") %>
             <%= hidden_field_tag 'confirm', 1 %>
-            <%= hidden_field 'history', 'status_id' %>
+            <%= hidden_field_tag 'new_status_id', @new_status.id %>
             <div class="box">
-            <p><label><%=l(:label_issue_status_new)%></label> <%= @history.status.name %></p>
+            <p><label><%=l(:label_issue_status_new)%></label> <%= @new_status.name %></p>
             <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label>
             <select name="issue[assigned_to_id]">
             <%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %>
             </select></p>
-            <p><label for="history_notes"><%=l(:field_notes)%></label>
+            <p><label for="notes"><%= l(:field_notes) %></label>
-            <%= text_area 'history', 'notes', :cols => 60, :rows => 10  %></p>
+            <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10 %></p>
             </div>
             <%= hidden_field 'issue', 'lock_version' %>

0

redmine/app/views/issues/edit.rhtml +1 -1

             <div class="clear">
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
-            <p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true %></p>
+            <p><%= f.text_area :description, :cols => 60, :rows => [[10, @issue.description.length / 50].max, 100].min, :required => true %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>

0

redmine/app/views/issues/show.rhtml +15 -20

             <b><%=l(:field_description)%> :</b><br /><br />
             <%= textilizable @issue.description %>
+            <br />
-            <p>
+            <div style="float:left;">
             <% if authorize_for('issues', 'edit') %>
               <%= start_form_tag ({:controller => 'issues', :action => 'edit', :id => @issue}, :method => "get" ) %>
               <%= submit_tag l(:button_edit) %>
             <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
               <%= start_form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) %>
               <%=l(:label_change_status)%> :
-              <select name="history[status_id]">
+              <select name="new_status_id">
               <%= options_from_collection_for_select @status_options, "id", "name" %>
               </select>
               <%= submit_tag l(:button_change) %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
+            </div>
+            <div style="float:right;">
             <% if authorize_for('issues', 'destroy') %>
               <%= start_form_tag ({:controller => 'issues', :action => 'destroy', :id => @issue} ) %>
               <%= submit_tag l(:button_delete) %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
-            </p>
+            </div>
+            <div class="clear"></div>
             </div>
-            <div class="box">
+            <div id="history" class="box">
-            <h3><%=l(:label_history)%></h3>
+            <h3><%=l(:label_history)%>
-            <table width="100%">
+            <% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3>
-            <% for history in @issue.histories.find(:all, :include => [:author, :status]) %>
+            <%= render :partial => 'history', :locals => { :journals => @journals } %>
-            <tr>
+            <% if @journals_count > @journals.length %>
-            <td><%= format_date(history.created_on) %></td>
+                <p><center><small>[ <%= link_to l(:label_change_view_all), :action => 'history', :id => @issue %> ]</small></center></p>
-            <td><%= history.author.display_name %></td>
-            <td><b><%= history.status.name %></b></td>
-            </tr>
-            <% if history.notes? %>
-            	<tr><td colspan=3><%= simple_format auto_link history.notes %></td></tr>
             <% end %>
-            <% end %>
-            </table>
             </div>
             <div class="box">
               <div class="box">
               <h3><%= l(:label_add_note) %></h3>
               <%= start_form_tag ({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) %>
-              <p><label for="history_notes"><%=l(:field_notes)%></label>
+              <p><label for="notes"><%=l(:field_notes)%></label>
-                <%= text_area 'history', 'notes', :cols => 60, :rows => 10  %></p>
+                <%= text_area_tag 'notes', '', :cols => 60, :rows => 10  %></p>
               <%= submit_tag l(:button_add) %>
               <%= end_form_tag %>
               </div>

0

redmine/app/views/layouts/base.rhtml +1 -1

             	<div id="footer">
             		<p>
             		<%= auto_link $RDM_FOOTER_SIG %> |
-            		<a href="http://redmine.org/" target="_new"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %>
+            		<a href="http://redmine.rubyforge.org/" target="_new"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %>
             		</p>
             	</div>

0

redmine/doc/CHANGELOG +1 0

             == xx/xx/2006 v0.x.x
+            * improved issues change history
             * new functionality: move an issue to another project or tracker
             * new functionality: add a note to an issue
             * new report: project activity

0

redmine/lang/de.yml +5 0

             label_months_from: Monate von
             label_gantt_chart: Gantt Diagramm
             label_internal: Intern
+            label_last_changes: %d änderungen des Letzten
+            label_change_view_all: Alle änderungen ansehen
             button_login: Einloggen
             button_submit: Einreichen
             text_project_destroy_confirmation: Sind sie sicher, daß sie das Projekt löschen wollen ?
             text_workflow_edit: Auswahl Workflow zum Bearbeiten
             text_are_you_sure: Sind sie sicher ?
+            text_journal_changed: geändert von %s zu %s
+            text_journal_set_to: gestellt zu %s
+            text_journal_deleted: gelöscht
             default_role_manager: Manager
             default_role_developper: Developer

0

redmine/lang/en.yml +5 0

             label_months_from: months from
             label_gantt_chart: Gantt chart
             label_internal: Internal
+            label_last_changes: last %d changes
+            label_change_view_all: View all changes
             button_login: Login
             button_submit: Submit
             text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
             text_workflow_edit: Select a role and a tracker to edit the workflow
             text_are_you_sure: Are you sure ?
+            text_journal_changed: changed from %s to %s
+            text_journal_set_to: set to %s
+            text_journal_deleted: deleted
             default_role_manager: Manager
             default_role_developper: Developer

0

redmine/lang/es.yml +5 0

             label_months_from: meses de
             label_gantt_chart: Diagrama de Gantt
             label_internal: Interno
+            label_last_changes: %d cambios del último
+            label_change_view_all: Ver todos los cambios
             button_login: Conexión
             button_submit: Someter
             text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ?
             text_workflow_edit: Seleccionar un workflow para actualizar
             text_are_you_sure: ¿ Estás seguro ?
+            text_journal_changed: cambiado de %s a %s
+            text_journal_set_to: fijado a %s
+            text_journal_deleted: suprimido
             default_role_manager: Manager
             default_role_developper: Desarrollador

0

redmine/lang/fr.yml +5 0

             label_months_from: mois depuis
             label_gantt_chart: Diagramme de Gantt
             label_internal: Interne
+            label_last_changes: %d derniers changements
+            label_change_view_all: Voir tous les changements
             button_login: Connexion
             button_submit: Soumettre
             text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ?
             text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
             text_are_you_sure: Etes-vous sûr ?
+            text_journal_changed: changé de %s à %s
+            text_journal_set_to: mis à %s
+            text_journal_deleted: supprimé
             default_role_manager: Manager
             default_role_developper: Développeur

0

redmine/public/stylesheets/application.css +12 -5

             .noborder {
             	border:0px;
-            Exception exceptions.AssertionError: <exceptions.AssertionError instance at 0xb7c0b20c> in <bound
-            method SubversionRepository.__del__ of <vclib.svn.SubversionRepository instance at 0xb7c1252c>>
-            ignored
             	background-color:#fff;
             	width:100%;
             }
             	border:1px solid #578bb8;
             }
-            hr { border:none; border-bottom: dotted 2px #c0c0c0; }
+            hr { border:none; border-bottom: dotted 1px #c0c0c0; }
             /**************** Sidebar styles ****************/
                 margin-left: 4px;
             }
+            #history h4 {
+                font-size: 1em;
+                margin-bottom: 12px;
+                margin-top: 20px;
+                font-weight: normal;
+                border-bottom: dotted 1px #c0c0c0;
+            }
+            #history p {
+                margin-left: 34px;
+            }
             /***** CSS FORM ******/
             .tabular p{

0

redmine/app/views/mailer/issue_add_note_de.rhtml removed 0 -3

1

NO CONTENT: file was removed

0

redmine/app/views/mailer/issue_add_note_en.rhtml removed 0 -3

1

NO CONTENT: file was removed

0

redmine/app/views/mailer/issue_add_note_es.rhtml removed 0 -3

1

NO CONTENT: file was removed

0

redmine/app/views/mailer/issue_add_note_fr.rhtml removed 0 -3

1

NO CONTENT: file was removed

0

redmine/app/views/mailer/issue_change_status_de.rhtml removed 0 -3

1

NO CONTENT: file was removed

0

redmine/app/views/mailer/issue_change_status_en.rhtml removed 0 -3

1

NO CONTENT: file was removed

0

redmine/app/views/mailer/issue_change_status_es.rhtml removed 0 -3

1

NO CONTENT: file was removed

0

redmine/app/views/mailer/issue_change_status_fr.rhtml removed 0 -3

1

NO CONTENT: file was removed

0

redmine/test/fixtures/issue_histories.yml removed 0 -29

1

NO CONTENT: file was removed

	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