Changeset 813
- Timestamp:
- 04/18/08 15:47:29 (4 months ago)
- Files:
-
- trunk/radiant/CHANGELOG (modified) (1 diff)
- trunk/radiant/app/models/layout.rb (modified) (1 diff)
- trunk/radiant/app/models/page.rb (modified) (1 diff)
- trunk/radiant/app/models/snippet.rb (modified) (1 diff)
- trunk/radiant/app/models/user.rb (modified) (1 diff)
- trunk/radiant/db/migrate/017_rename_created_by_updated_by_columns.rb (added)
- trunk/radiant/db/schema.rb (modified) (6 diffs)
- trunk/radiant/spec/scenarios/users_and_pages_scenario.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/radiant/CHANGELOG
r812 r813 2 2 3 3 === SVN 4 * Rename created_by and updated_by columns on standard models. [Sean Cribbs] 4 5 * Fix Dir glob for extension rake tasks. [Sean Cribbs] 5 6 * Respect view_paths set by plugins in extensions. [xtoddx] trunk/radiant/app/models/layout.rb
r405 r813 6 6 # Associations 7 7 has_many :pages 8 belongs_to :created_by, :class_name => 'User' , :foreign_key => 'created_by'9 belongs_to :updated_by, :class_name => 'User' , :foreign_key => 'updated_by'8 belongs_to :created_by, :class_name => 'User' 9 belongs_to :updated_by, :class_name => 'User' 10 10 11 11 # Validations trunk/radiant/app/models/page.rb
r730 r813 12 12 has_many :parts, :class_name => 'PagePart', :order => 'id', :dependent => :destroy 13 13 belongs_to :layout 14 belongs_to :created_by, :class_name => 'User' , :foreign_key => 'created_by'15 belongs_to :updated_by, :class_name => 'User' , :foreign_key => 'updated_by'14 belongs_to :created_by, :class_name => 'User' 15 belongs_to :updated_by, :class_name => 'User' 16 16 17 17 # Validations trunk/radiant/app/models/snippet.rb
r405 r813 5 5 6 6 # Associations 7 belongs_to :created_by, :class_name => 'User' , :foreign_key => 'created_by'8 belongs_to :updated_by, :class_name => 'User' , :foreign_key => 'updated_by'7 belongs_to :created_by, :class_name => 'User' 8 belongs_to :updated_by, :class_name => 'User' 9 9 10 10 # Validations trunk/radiant/app/models/user.rb
r405 r813 7 7 8 8 # Associations 9 belongs_to :created_by, :class_name => 'User' , :foreign_key => 'created_by'10 belongs_to :updated_by, :class_name => 'User' , :foreign_key => 'updated_by'9 belongs_to :created_by, :class_name => 'User' 10 belongs_to :updated_by, :class_name => 'User' 11 11 12 12 # Validations trunk/radiant/db/schema.rb
r794 r813 10 10 # It's strongly recommended to check this file into your version control system. 11 11 12 ActiveRecord::Schema.define(:version => 1 6) do12 ActiveRecord::Schema.define(:version => 17) do 13 13 14 14 create_table "config", :force => true do |t| … … 26 26 27 27 create_table "layouts", :force => true do |t| 28 t.string "name", :limit => 10028 t.string "name", :limit => 100 29 29 t.text "content" 30 30 t.datetime "created_at" 31 31 t.datetime "updated_at" 32 t.integer "created_by "33 t.integer "updated_by "34 t.string "content_type", :limit => 4035 t.integer "lock_version", :default => 032 t.integer "created_by_id" 33 t.integer "updated_by_id" 34 t.string "content_type", :limit => 40 35 t.integer "lock_version", :default => 0 36 36 end 37 37 … … 45 45 create_table "pages", :force => true do |t| 46 46 t.string "title" 47 t.string "slug", :limit => 10048 t.string "breadcrumb", :limit => 16049 t.string "class_name", :limit => 2550 t.integer "status_id", :default => 1, :null => false47 t.string "slug", :limit => 100 48 t.string "breadcrumb", :limit => 160 49 t.string "class_name", :limit => 25 50 t.integer "status_id", :default => 1, :null => false 51 51 t.integer "parent_id" 52 52 t.integer "layout_id" … … 54 54 t.datetime "updated_at" 55 55 t.datetime "published_at" 56 t.integer "created_by "57 t.integer "updated_by "58 t.boolean "virtual", :default => false, :null => false59 t.integer "lock_version", :default => 056 t.integer "created_by_id" 57 t.integer "updated_by_id" 58 t.boolean "virtual", :default => false, :null => false 59 t.integer "lock_version", :default => 0 60 60 end 61 61 … … 70 70 71 71 create_table "snippets", :force => true do |t| 72 t.string "name", :limit => 100, :default => "", :null => false73 t.string "filter_id", :limit => 2572 t.string "name", :limit => 100, :default => "", :null => false 73 t.string "filter_id", :limit => 25 74 74 t.text "content" 75 75 t.datetime "created_at" 76 76 t.datetime "updated_at" 77 t.integer "created_by "78 t.integer "updated_by "79 t.integer "lock_version", :default => 077 t.integer "created_by_id" 78 t.integer "updated_by_id" 79 t.integer "lock_version", :default => 0 80 80 end 81 81 … … 83 83 84 84 create_table "users", :force => true do |t| 85 t.string "name", :limit => 10085 t.string "name", :limit => 100 86 86 t.string "email" 87 t.string "login", :limit => 40, :default => "", :null => false88 t.string "password", :limit => 4087 t.string "login", :limit => 40, :default => "", :null => false 88 t.string "password", :limit => 40 89 89 t.datetime "created_at" 90 90 t.datetime "updated_at" 91 t.integer "created_by "92 t.integer "updated_by "93 t.boolean "admin", :default => false, :null => false94 t.boolean "developer", :default => false, :null => false91 t.integer "created_by_id" 92 t.integer "updated_by_id" 93 t.boolean "admin", :default => false, :null => false 94 t.boolean "developer", :default => false, :null => false 95 95 t.text "notes" 96 t.integer "lock_version", :default => 096 t.integer "lock_version", :default => 0 97 97 end 98 98 trunk/radiant/spec/scenarios/users_and_pages_scenario.rb
r669 r813 4 4 def load 5 5 UserActionObserver.current_user = users(:admin) 6 Page.update_all "created_by = #{user_id(:admin)}, updated_by= #{user_id(:admin)}"6 Page.update_all "created_by_id = #{user_id(:admin)}, updated_by_id = #{user_id(:admin)}" 7 7 create_page "No User" 8 8 end
