Undelete

app/models/log_entry/event_log_entry.rb

@@ -25,7 +25,7 @@ class EventDeleteLogEntry < EventLogEntry
         event.deleted?
 	end
 	def undo!(current_user)
-		event.restore!
+		event.recover!
 		EventRestoreLogEntry.create!(:target_id => event.id, :user_id => current_user.id, :course => event.course, :version => event.version)
 	end
 end

app/models/log_entry/wiki_log_entry.rb

@@ -29,8 +29,8 @@ class WikiDeleteLogEntry < WikiLogEntry
 		wiki_page.deleted?
 	end
 	def undo!(current_user)
-		wiki_page.update_attribute(:deleted_at, nil)
 		wiki_page.update_attribute(:position, (wiki_page.course.wiki_pages.maximum(:position)||0) + 1)
+		wiki_page.update_attribute(:deleted_at, nil)
 		WikiRestoreLogEntry.create!(:target_id => wiki_page.id, :user_id => current_user.id, :course => wiki_page.course)
 	end
 end

app/models/wiki_page.rb

@@ -46,9 +46,9 @@ class WikiPage < ActiveRecord::Base
 
 	def before_save
 		if !self.front_page
-			self.remove_from_list
+            self.remove_from_list
 		elsif self.position.nil?
-			self.insert_at(1)
+            self.update_attribute(:position, (self.course.wiki_pages.maximum(:position)||0) + 1)
 		end
 	end