diff --git a/app/views/user_admin/user_stat.html.haml b/app/views/user_admin/user_stat.html.haml --- a/app/views/user_admin/user_stat.html.haml +++ b/app/views/user_admin/user_stat.html.haml @@ -34,6 +34,7 @@ %th Activated? %th Logged in %th Contest(s) + %th Remark - @problems.each do |p| %th= p.name %th Total @@ -49,6 +50,7 @@ %td= sc[i].activated %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %td= sc[i].contests.collect {|c| c.name}.join(', ') + %td= sc[i].remark - else %td= sc[i][0] - total += sc[i][0] diff --git a/db/migrate/20150203153534_add_more_to_users.rb b/db/migrate/20150203153534_add_more_to_users.rb new file mode 100644 --- /dev/null +++ b/db/migrate/20150203153534_add_more_to_users.rb @@ -0,0 +1,6 @@ +class AddMoreToUsers < ActiveRecord::Migration + def change + add_column :users, :enabled, :boolean, default: 1 + add_column :users, :remark, :string + end +end diff --git a/db/schema.rb b/db/schema.rb --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20140917150629) do +ActiveRecord::Schema.define(:version => 20150203153534) do create_table "announcements", :force => true do |t| t.string "author" @@ -239,6 +239,8 @@ t.boolean "activated", :default => false t.datetime "created_at" t.datetime "updated_at" + t.boolean "enabled", :default => true + t.string "remark" end add_index "users", ["login"], :name => "index_users_on_login", :unique => true