<%= link_to "Edit", edit_product_path(product), class: "btn btn-default" %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index ba4eef3..8fcf2ab 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,10 +1,8 @@
<%= render partial: 'flash' %>
-
- <%= @user.full_name %> - <%= @user.nickname %>
- <%= link_to "edit" , edit_user_registration_path %>
-
+ <%= @user.nickname %> (<%= @user.full_name %>)
+ <%= link_to "[Edit profile]" , edit_user_registration_path %>
Balance: <%= euro(@user.balance) %>
diff --git a/db/schema.rb b/db/schema.rb
index 47f2f07..54e2982 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,13 +13,13 @@
ActiveRecord::Schema.define(version: 20150210062809) do
- create_table "order_items", force: true do |t|
+ create_table "order_items", force: :cascade do |t|
t.integer "order_id"
t.integer "product_id", null: false
t.integer "count", default: 0
end
- create_table "orders", force: true do |t|
+ create_table "orders", force: :cascade do |t|
t.integer "user_id"
t.integer "cost"
t.datetime "created_at", null: false
@@ -29,32 +29,24 @@ ActiveRecord::Schema.define(version: 20150210062809) do
add_index "orders", ["user_id", "created_at"], name: "index_orders_on_user_id_and_created_at"
add_index "orders", ["user_id"], name: "index_orders_on_user_id"
- create_table "products", force: true do |t|
+ create_table "products", force: :cascade do |t|
t.string "name", null: false
t.integer "price_cents", default: 0, null: false
- t.integer "category", default: 0
- t.integer "stock", default: 0, null: false
+ t.datetime "created_at"
+ t.datetime "updated_at"
t.string "avatar_file_name"
t.string "avatar_content_type"
t.integer "avatar_file_size"
t.datetime "avatar_updated_at"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.integer "category", default: 0
+ t.integer "stock", default: 0, null: false
end
- create_table "users", force: true do |t|
+ create_table "users", force: :cascade do |t|
t.string "name"
t.string "last_name"
t.integer "balance_cents", default: 0, null: false
t.string "nickname"
- t.boolean "admin"
- t.boolean "koelkast", default: false
- t.integer "dagschotel_id"
- t.integer "orders_count", default: 0
- t.string "avatar_file_name"
- t.string "avatar_content_type"
- t.integer "avatar_file_size"
- t.datetime "avatar_updated_at"
t.datetime "created_at"
t.datetime "updated_at"
t.string "encrypted_password", default: "", null: false
@@ -64,12 +56,20 @@ ActiveRecord::Schema.define(version: 20150210062809) do
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
+ t.boolean "admin"
+ t.integer "dagschotel_id"
+ t.string "avatar_file_name"
+ t.string "avatar_content_type"
+ t.integer "avatar_file_size"
+ t.datetime "avatar_updated_at"
+ t.integer "orders_count", default: 0
+ t.boolean "koelkast", default: false
end
add_index "users", ["koelkast"], name: "index_users_on_koelkast"
add_index "users", ["orders_count"], name: "index_users_on_orders_count"
- create_table "versions", force: true do |t|
+ create_table "versions", force: :cascade do |t|
t.string "item_type", null: false
t.integer "item_id", null: false
t.string "event", null: false