Changeset 342
- Timestamp:
- 12/14/06 18:19:46 (2 years ago)
- Files:
-
- trunk/app/views/timeline/_display_event.rhtml (modified) (4 diffs)
- trunk/db/migrate/001_initial.rb (modified) (2 diffs)
- trunk/test/functional/asset_field_controller_test.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/app/views/timeline/_display_event.rhtml
r330 r342 11 11 <%= 12 12 case event.event_type 13 14 15 16 17 18 19 20 21 22 23 end 13 when WorkOrderEvent.TYPES[:CREATED] 14 _('Created by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 15 when WorkOrderEvent.TYPES[:CLOSED] 16 _('Closed by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 17 when WorkOrderEvent.TYPES[:ASSIGNED] 18 _("Assigned to %s by %s", event.work_order_owner ? event.work_order_owner.login_and_name : _('Unknown'), event.creator ? event.creator.login_and_name : _('Unknown')) 19 when WorkOrderEvent.TYPES[:ACCEPTED] 20 _('Accepted by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 21 when WorkOrderEvent.TYPES[:REOPENED] 22 _('Reopened by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 23 end 24 24 -%> 25 25 </span> … … 30 30 31 31 <span class="created"> 32 <%= 32 <%= 33 33 case event.event_type 34 when ReportEvent.TYPES[:CREATED] 35 36 37 _('Modified by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 34 when ReportEvent.TYPES[:CREATED] 35 _('Created by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 36 when ReportEvent.TYPES[:MODIFIED] 37 _('Modified by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 38 38 end 39 39 -%> 40 40 </span> 41 41 42 42 <% when 'AttachmentEvent' -%> 43 43 <%= link_to_asset(event.attachment.asset) if show_asset_link %> … … 45 45 46 46 <span class="created"> 47 <%= 47 <%= 48 48 case event.event_type 49 49 when AttachmentEvent.TYPES[:CREATED] 50 50 _('Uploaded by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 51 end 51 end 52 52 -%> 53 53 </span> … … 56 56 </dt> 57 57 58 <% if event.comment_text and !event.comment_text == "" -%>58 <% if event.comment_text and event.comment_text != '' -%> 59 59 <dd class="timeline_event_comment"> 60 60 <%= h(event.comment_text) %> trunk/db/migrate/001_initial.rb
r203 r342 293 293 t.column 'type', :string, :limit => 20, :default => '', :null => false 294 294 t.column 'event_type', :integer, :default => 0, :null => false 295 t.column 'comment_text', :text , :default => '', :null => false295 t.column 'comment_text', :text 296 296 t.column 'created_by', :integer, :references => :users 297 297 t.column 'created_at', :datetime … … 382 382 t.column 'unread', :boolean, :default => true, :null => false 383 383 t.column 'subject', :string, :limit => 80, :default => '', :null => false 384 t.column 'body', :text, : default => '', :null => false384 t.column 'body', :text, :null => false 385 385 t.column 'created_at', :datetime 386 386 end trunk/test/functional/asset_field_controller_test.rb
r329 r342 97 97 assert_redirected_to :action => 'list', :id => @asset_type.id.to_s 98 98 assert_raise(ActiveRecord::RecordNotFound) { AssetField.find field.id } 99 assert_n il flash[:notice]99 assert_not_nil flash[:notice] 100 100 assert_nil flash[:error] 101 101 end
