Index: app/models/time_entry.rb =================================================================== --- app/models/time_entry.rb (revision 574) +++ app/models/time_entry.rb (working copy) @@ -25,9 +25,8 @@ attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek - validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on + validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on, :comments validates_numericality_of :hours, :allow_nil => true - validates_length_of :comments, :maximum => 255 def before_validation self.project = issue.project if issue && project.nil? Index: app/views/timelog/details.rhtml =================================================================== --- app/views/timelog/details.rhtml (revision 574) +++ app/views/timelog/details.rhtml (working copy) @@ -36,7 +36,7 @@ <% end %> -<%=h entry.comments %> +<%= textilizable entry.comments %> <%= entry.hours %> <%= link_to_if_authorized(l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => entry}, :class => "icon icon-edit") if entry.user_id == @owner_id %> Index: app/views/timelog/edit.rhtml =================================================================== --- app/views/timelog/edit.rhtml (revision 574) +++ app/views/timelog/edit.rhtml (working copy) @@ -7,7 +7,7 @@

<%= f.text_field :issue_id, :size => 6 %> <%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %>

<%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>

<%= f.text_field :hours, :size => 6, :required => true %>

-

<%= f.text_field :comments, :size => 100 %>

+

<%= f.text_area :comments, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit' %>

<%= f.select :activity_id, (@activities.collect {|p| [p.name, p.id]}), :required => true %>

@@ -20,4 +20,6 @@ <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %> <%= javascript_include_tag 'calendar/calendar-setup' %> <%= stylesheet_link_tag 'calendar' %> -<% end %> \ No newline at end of file +<% end %> + +<%= wikitoolbar_for 'time_entry_comments' %> \ No newline at end of file Index: db/migrate/058_change_time_entries_comments.rb =================================================================== --- db/migrate/058_change_time_entries_comments.rb (revision 0) +++ db/migrate/058_change_time_entries_comments.rb (revision 0) @@ -0,0 +1,9 @@ +class ChangeTimeEntriesComments < ActiveRecord::Migration + def self.up + change_column :time_entries, :comments, :text, :default => nil + end + + def self.down + raise IrreversibleMigration + end +end