--- a/app/models/event/event.rb
+++ b/app/models/event/event.rb
@@ -13,12 +13,14 @@ class Event < ActiveRecord::Base
                            events.created_at,
                            coalesce(system_events.summary,
                                     debug_events.summary,
-                                    error_events.summary
+                                    error_events.summary,
+                                    journals.summary
                                    ) AS summary
                     FROM events
                     LEFT JOIN system_events ON events.entry_type = 'system' AND events.entry_id = system_events.id
                     LEFT JOIN debug_events ON events.entry_type = 'debug' AND events.entry_id = debug_events.id
-                    LEFT JOIN error_events ON events.entry_type = 'debug' AND events.entry_id = error_events.id
+                    LEFT JOIN error_events ON events.entry_type = 'error' AND events.entry_id = error_events.id
+                    LEFT JOIN journals ON events.entry_type = 'journal' AND events.entry_id = journals.id
                     LEFT JOIN users ON events.user_id = users.id
                     WHERE project_id = '#{project_id}'
                     ORDER BY events.created_at DESC"]

--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -23,9 +23,10 @@ class Journal < ActiveRecord::Base
     journal.row_id = model.id
     journal.ip = ip
     journal.user_id = user_id
+    journal.summary = "Created new " << model.class.to_s
      #TODO check saves okay
     journal.save
-    #
+    
     for column in model.class.columns
       #filter columns we don't want to track
       case column.name
@@ -88,6 +89,7 @@ class Journal < ActiveRecord::Base
     journal.row_id = updated_model.id
     journal.ip = ip
     journal.user_id = user_id
+    journal.summary = "Updated " << model.class.to_s
      #TODO check saves okay
     journal.save
     #

--- a/db/migrate/402_create_journals.rb
+++ b/db/migrate/402_create_journals.rb
@@ -17,6 +17,7 @@ class CreateJournals < ActiveRecord::Migration
     # one journal entry for every create or update action
     create_table :journals do |t|
       t.column :model_type, :enum, :limit => [:article, :ticket, :wiki, :comment]
+      t.string :summary
       t.integer :row_id, :references => nil # key back to the owner (e.g. article_id)
       t.column :action, :enum, :limit => [:create, :update]
       t.integer :user_id