0
@@ -144,7 +144,6 @@ class BookmarkController < ApplicationController
0
   def convert_bookmark
0
     @new_bookmark = @box.bookmarks.build(@bookmark.attributes.reject{|k,v|k=="#{@bookmark_scope}_id"})
0
     @new_bookmark.created_at = @bookmark.created_at
0
-    @new_bookmark.visited_at = @bookmark.visited_at
0
     @new_bookmark.save!
0
     @bookmark.destroy
0
     @new_bookmark.insert_at(params[:bmark_position]) if params[:bmark_position]

0
@@ -7,17 +7,9 @@ class Bookmark < ActiveRecord::Base
0
   validates_length_of     :url, :maximum => 1024
0
   validates_length_of     :name, :maximum => 255
0
   
0
-  attr_protected          :box_id, :position, :created_at, :visited_at
0
+  attr_protected          :box_id, :position, :created_at
0
   
0
   
0
-  def self.find_all_via_users_boxes(user,params)
0
-    user.boxes.find :all, :conditions => ['bookmarks.id IN (?)', params], :include => :bookmarks
0
-  end
0
-  
0
-  def self.find_via_users_boxes(user,id)
0
-    user.boxes.find(:first, :conditions => ['bookmarks.id = ?', id], :include => :bookmarks).bookmarks[0]
0
-  end
0
-  
0
   
0
   
0
 end

0
@@ -13,7 +13,7 @@ class Column < ActiveRecord::Base
0
   protected
0
   
0
   def delete_all_associations
0
-    Bookmark.delete_all :box_id => boxes.map(&:id)
0
+    Bookmark.delete_all :box_id => boxes
0
     Box.delete_all :column_id => id
0
   end
0
   

0
@@ -7,7 +7,7 @@ class Inboxmark < ActiveRecord::Base
0
   validates_length_of     :url, :maximum => 1024
0
   validates_length_of     :name, :maximum => 255
0
   
0
-  attr_protected          :inbox_id, :position, :created_at, :visited_at
0
+  attr_protected          :inbox_id, :position, :created_at
0
   
0
   
0
   

0
@@ -7,7 +7,7 @@ class Trashboxmark < ActiveRecord::Base
0
   validates_length_of     :url, :maximum => 1024
0
   validates_length_of     :name, :maximum => 255
0
   
0
-  attr_protected          :trashbox_id, :position, :created_at, :visited_at
0
+  attr_protected          :trashbox_id, :position, :created_at
0
   
0
   
0
   

0
@@ -9,13 +9,12 @@
0
 #
0
 # It's strongly recommended to check this file into your version control system.
0
 
0
-ActiveRecord::Schema.define(:version => 20080623024211) do
0
+ActiveRecord::Schema.define(:version => 20080707002249) do
0
 
0
   create_table "bookmarks", :force => true do |t|
0
     t.integer  "box_id",                     :null => false
0
     t.string   "url",        :limit => 1024, :null => false
0
     t.string   "name",                       :null => false
0
-    t.datetime "visited_at"
0
     t.integer  "position"
0
     t.datetime "created_at"
0
     t.datetime "updated_at"
0
@@ -55,7 +54,6 @@ ActiveRecord::Schema.define(:version => 20080623024211) do
0
     t.string   "url",        :limit => 1024, :null => false
0
     t.string   "name",                       :null => false
0
     t.datetime "created_at",                 :null => false
0
-    t.datetime "visited_at"
0
     t.integer  "position"
0
   end
0
 
0
@@ -81,7 +79,6 @@ ActiveRecord::Schema.define(:version => 20080623024211) do
0
     t.string   "url",         :limit => 1024, :null => false
0
     t.string   "name",                        :null => false
0
     t.datetime "created_at",                  :null => false
0
-    t.datetime "visited_at"
0
     t.integer  "position"
0
   end
0
 

0
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
0
 class InboxmarkTest < ActiveSupport::TestCase
0
   
0
   should_belong_to  :inbox
0
-  should_protect_attributes :inbox_id, :position, :created_at, :visited_at
0
+  should_protect_attributes :inbox_id, :position, :created_at
0
   
0
   
0
   def setup

0
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
0
 class TrashboxmarkTest < ActiveSupport::TestCase
0
   
0
   should_belong_to  :trashbox
0
-  should_protect_attributes :trashbox_id, :position, :created_at, :visited_at
0
+  should_protect_attributes :trashbox_id, :position, :created_at
0
   
0
   
0
   def setup