Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'master' into master-to-rails3

Browse source 
Conflicts:
	Gemfile
	README_DEVEL
	app/controllers/articles_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/articles/_import_search_results.haml
	app/views/articles/index.haml
	app/views/messages/new.haml
	app/views/ordering/_order_head.haml
	app/views/ordering/my_order_result.haml
	app/views/orders/show.haml
	app/views/stockit/new.html.haml
	db/schema.rb
This commit is contained in:
benni 2012-12-14 18:10:46 +01:00
commit 0edd29dfd4
15 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
db/migrate/20121112093327_add_created_by_user_id_to_orders.rb Normal file
View file

@ -0,0 +1,9 @@
class AddCreatedByUserIdToOrders < ActiveRecord::Migration
def self.up
add_column :orders, :created_by_user_id, :integer
end
def self.down
remove_column :orders, :created_by_user_id
end
end

3
db/schema.rb
View file

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20120929155541) do
ActiveRecord::Schema.define(:version => 20121112093327) do
create_table "article_categories", :force => true do |t|
t.string "name", :default => "", :null => false
@ -253,6 +253,7 @@ ActiveRecord::Schema.define(:version => 20120929155541) do
t.integer "lock_version", :default => 0, :null => false
t.integer "updated_by_user_id"
t.decimal "foodcoop_result", :precision => 8, :scale => 2
t.integer "created_by_user_id"
end
add_index "orders", ["state"], :name => "index_orders_on_state"