cafe-grader-web Commit - r18:d8813c40713d

cafe-grader-web

Commit `r18:d8813c40713d` public

parent | child

Description:

add_email_to_user, fix empty problem for_in_place_editing git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@42 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r18:d8813c40713d - Fri, 08 Feb 2008 07:41:41 - 5 files changed: 42 inserted, 4 deleted

db/migrate/012_add_email_to_users.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class AddEmailToUsers < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :users, :email, :string
	4	+ end
	5	+
	6	+ def self.down
	7	+ remove_column :users, :email
	8	+ end
	9	+ end

app/controllers/users_controller.rb ¶ +2 -1

               class UsersController < ApplicationController
                 before_filter :authenticate
                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                 in_place_edit_for :user, :full_name
-            -   in_place_edit_for :user, :alias
+            +   in_place_edit_for :user, :alias_for_editing
+            +   in_place_edit_for :user, :email_for_editing
                 def index
                   @user = User.find(session[:user_id])
                 end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
               end

app/models/user.rb ¶ +25 -1

               require 'digest/sha1'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
                 validates_presence_of :login
                 validates_presence_of :full_name
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 attr_accessor :password
                 before_save :encrypt_new_password
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   return user if user && user.authenticated?(password)
                 end
                 def authenticated?(password)
                   hashed_password == encrypt(password,salt)
                 end
                 def admin?
                   self.roles.detect {|r| r.name == 'admin' }
                 end
-            - #  protected
+            +   def email_for_editing
+            +     if self.email!=nil
+            +       self.email
+            +     else
+            +       "unknown"
+            +     end
+            +   end
+            +
+            +   def email_for_editing=(e)
+            +     self.email=e
+            +   end
+            +
+            +   def alias_for_editing
+            +     if self.alias!=nil
+            +       self.alias
+            +     else
+            +       "unknown"
+            +     end
+            +   end
+            +
+            +   def alias_for_editing=(e)
+            +     self.alias=e
+            +   end
+            +
+            +   protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = encrypt(password,salt)
                   end
                   def password_required?
                     hashed_password.blank? || !password.blank?
                   end
                   def encrypt(string,salt)
                     Digest::SHA1.hexdigest(salt + string)
                   end
               end

app/views/users/index.html.haml ¶ +4 -1

               %h1 Your account settings
               %p
                 You can edit your full name and alias.  Just click on the text and edit it.
               %table.uinfo
                 %tr
                   %th.uinfo Login
                   %td.uinfo= @user.login
                 %tr
                   %th.uinfo Full name
                   %td.uinfo= in_place_editor_field :user, 'full_name', {}, :rows => 1
                 %tr
                   %th.uinfo Alias
-            -     %td.uinfo= in_place_editor_field :user, 'alias', {}, :rows => 1
+            +     %td.uinfo= in_place_editor_field :user, 'alias_for_editing', {}, :rows => 1
+            +   %tr
+            +     %th.uinfo E-mail
+            +     %td.uinfo= in_place_editor_field :user, 'email_for_editing', {}, :rows => 1
                 %tr
                   %th.uinfo Password
                   %td.uinfo
                     - form_tag :action => 'chg_passwd', :method => 'post' do
                       %table
                         %tr
                           %td= password_field_tag 'passwd'
                           %td (new)
                         %tr
                           %td= password_field_tag 'passwd_verify'
                           %td (verify)
                         %tr
                           %td{:colspan => "2"}
                             = submit_tag 'change password'

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of ActiveRecord to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 11) do
+            + ActiveRecord::Schema.define(:version => 12) do
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",       :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
                 create_table "rights_roles", :id => false, :force => true do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                 end
                 add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
                 create_table "roles", :force => true do |t|
                   t.string "name"
                 end
                 create_table "roles_users", :id => false, :force => true do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
                   t.text     "data"
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment"
                 end
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|
                   t.integer  "submission_id"
                   t.datetime "created_at"
                 end
                 create_table "users", :force => true do |t|
                   t.string "login",           :limit => 10
                   t.string "full_name"
                   t.string "hashed_password"
                   t.string "salt",            :limit => 5
                   t.string "alias"
+            +     t.string "email"
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
               end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r18:d8813c40713d - Fri, 08 Feb 2008 07:41:41 - 5 files changed: 42 inserted, 4 deleted

Sign in to your account

Commit r18:d8813c40713d public

Author

r18:d8813c40713d - Fri, 08 Feb 2008 07:41:41 - 5 files changed: 42 inserted, 4 deleted

Commit `r18:d8813c40713d` public