cafe-grader-web Commit - r18:d8813c40713d

cafe-grader-web

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

                 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

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

@@ -25,13 +25,37
25	end	25	end
26		26
27	def admin?	27	def admin?
28	self.roles.detect {\|r\| r.name == 'admin' }	28	self.roles.detect {\|r\| r.name == 'admin' }
29	end	29	end
30		30
31	- # protected	31	+ def email_for_editing
		32	+ if self.email!=nil
		33	+ self.email
		34	+ else
		35	+ "unknown"
		36	+ end
		37	+ end
		38	+
		39	+ def email_for_editing=(e)
		40	+ self.email=e
		41	+ end
		42	+
		43	+ def alias_for_editing
		44	+ if self.alias!=nil
		45	+ self.alias
		46	+ else
		47	+ "unknown"
		48	+ end
		49	+ end
		50	+
		51	+ def alias_for_editing=(e)
		52	+ self.alias=e
		53	+ end
		54	+
		55	+ protected
32	def encrypt_new_password	56	def encrypt_new_password
33	return if password.blank?	57	return if password.blank?
34	self.salt = (10+rand(90)).to_s	58	self.salt = (10+rand(90)).to_s
35	self.hashed_password = encrypt(password,salt)	59	self.hashed_password = encrypt(password,salt)
36	end	60	end
37		61

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

                   %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

db/schema.rb ¶ +2 -1

               # 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 "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

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

	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