track last edit

app/models/merged/active_base.rb

@@ -5,11 +5,11 @@ module Merged
     def edit_save( editor )
       self.updated_at = Time.now
       self.updated_by = editor
-      edit_save!
+      edit_save!(editor)
     end
 
-    def edit_save!
-      ChangeSet.current.edit(self.class.name , self.change_name)
+    def edit_save!(editor)
+      ChangeSet.current.edit(self.class.name , self.change_name, editor)
       save!()
       self.class.save_all
     end
@@ -17,17 +17,17 @@ module Merged
     def add_save( editor )
       self.updated_at = Time.now
       self.updated_by = editor
-      add_save!
+      add_save!(editor)
     end
 
-    def add_save!
-      ChangeSet.current.add(self.class.name , self.change_name)
+    def add_save!(editor)
+      ChangeSet.current.add(self.class.name , self.change_name, editor)
       save!()
       self.class.save_all
     end
 
-    def delete_save!
-      ChangeSet.current.delete(self.class.name , self.change_name)
+    def delete_save!(editor)
+      ChangeSet.current.delete(self.class.name , self.change_name,editor)
       self.class.delete(self.id)
       self.class.save_all
     end

app/models/merged/card.rb

@@ -38,8 +38,8 @@ module Merged
       CardStyle.find_by_template( self.template )
     end
 
-    def delete_and_reset_index
-      delete_save!
+    def delete_and_reset_index(editor)
+      delete_save!(editor)
       section.reset_index
       Section.find(section_id).reset_index
       Card.save_all

app/models/merged/change_set.rb

@@ -5,7 +5,7 @@ module Merged
     def self.current
       @@current ||= ChangeSet.new
     end
-    attr_reader :adds , :edits , :deletes
+    attr_reader :adds , :edits , :deletes , :last , :last_editor
 
     def initialize
       zero
@@ -16,16 +16,26 @@ module Merged
       @adds = Set.new
       @edits = Set.new
       @deletes = Set.new
+      @last = nil
+      @last_editor = nil
     end
 
-    def add( type , text)
+    def touch(editor)
+      @last = Time.now
+      @last_editor = editor
+    end
+
+    def add( type , text , editor)
+      touch(editor)
       @adds << [typed(type) , text ]
     end
 
-    def edit( type , text)
+    def edit( type , text, editor)
+      touch(editor)
       @edits << [typed(type) , text ]
     end
-    def delete( type , text)
+    def delete( type , text, editor)
+      touch(editor)
       @deletes << [typed(type) , text ]
     end
 

app/models/merged/image.rb

@@ -55,7 +55,7 @@ module Merged
 
     def destroy
       File.delete self.full_filename
-      delete_save!
+      delete_save!(current_member.email)
     end
 
     def asset_name

app/models/merged/page.rb

@@ -51,9 +51,9 @@ module Merged
       sections.each_with_index{|section, index| section.index = index + 1}
     end
 
-    def delete
-      sections.each {|section| section.delete }
-      delete_save!
+    def delete(editor)
+      sections.each {|section| section.delete(editor) }
+      delete_save!(editor)
     end
 
     def save(editor)

app/models/merged/section.rb

@@ -37,15 +37,6 @@ module Merged
       ! card_template.blank?
     end
 
-    def remove_card(card)
-      from_index = card.index
-      @cards.delete_at(from_index)
-      @content["cards"].delete_at(from_index)
-      @cards.each_with_index do |card, index|
-        card.set_index(index)
-      end
-    end
-
     def move_up
       swap_index_with(next_section)
     end
@@ -71,13 +62,13 @@ module Merged
       cards.each_with_index{|card, index| card.index = index + 1}
     end
 
-    def delete
-      cards.each {|card| card.delete_save! }
-      delete_save!()
+    def delete(editor)
+      cards.each {|card| card.delete_save!(editor) }
+      delete_save!(editor)
     end
 
-    def delete_and_reset_index
-      delete
+    def delete_and_reset_index(editor)
+      delete(editor)
       Page.find(page_id).reset_index
       Section.save_all
     end