Description:
added more user for codejom registration
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r224:a42bdb5b1634 - - 5 files changed: 75 inserted, 16 deleted
| @@ -1,3 +1,4 | |||||
|
|
|
1 | + # -*- coding: undecided -*- | ||
|
|
1 | require 'digest/sha1' |
|
2 | require 'digest/sha1' |
|
|
2 |
|
3 | ||
|
|
3 | class User < ActiveRecord::Base |
|
4 | class User < ActiveRecord::Base |
| @@ -32,10 +33,13 | |||||
|
|
32 | validates_presence_of :login |
|
33 | validates_presence_of :login |
|
|
33 | validates_uniqueness_of :login |
|
34 | validates_uniqueness_of :login |
|
|
34 | validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/ |
|
35 | validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/ |
|
|
35 |
- validates_length_of :login, :within => 3.. |
|
36 | + validates_length_of :login, :within => 3..20 |
|
|
36 |
|
37 | ||
|
|
37 | validates_presence_of :full_name |
|
38 | validates_presence_of :full_name |
|
|
38 | validates_length_of :full_name, :minimum => 1 |
|
39 | validates_length_of :full_name, :minimum => 1 |
|
|
|
40 | + | ||
|
|
|
41 | + validates_presence_of :member1_full_name | ||
|
|
|
42 | + validates_length_of :member1_full_name, :minimum => 1 | ||
|
|
39 |
|
43 | ||
|
|
40 | validates_presence_of :password, :if => :password_required? |
|
44 | validates_presence_of :password, :if => :password_required? |
|
|
41 | validates_length_of :password, :within => 4..20, :if => :password_required? |
|
45 | validates_length_of :password, :within => 4..20, :if => :password_required? |
| @@ -49,6 +53,8 | |||||
|
|
49 | validate :enough_time_interval_between_same_email_registrations, |
|
53 | validate :enough_time_interval_between_same_email_registrations, |
|
|
50 | :if => :email_validation? |
|
54 | :if => :email_validation? |
|
|
51 |
|
55 | ||
|
|
|
56 | + validate :school_names_for_high_school_users | ||
|
|
|
57 | + | ||
|
|
52 | # these are for ytopc |
|
58 | # these are for ytopc |
|
|
53 | # disable for now |
|
59 | # disable for now |
|
|
54 | #validates_presence_of :province |
|
60 | #validates_presence_of :province |
| @@ -295,4 +301,15 | |||||
|
|
295 | return false |
|
301 | return false |
|
|
296 | end |
|
302 | end |
|
|
297 | end |
|
303 | end |
|
|
|
304 | + | ||
|
|
|
305 | + | ||
|
|
|
306 | + def school_names_for_high_school_users | ||
|
|
|
307 | + if self.high_school | ||
|
|
|
308 | + if (self.member1_school_name=='' or | ||
|
|
|
309 | + (self.member2_full_name!='' and self.member2_school_name=='') or | ||
|
|
|
310 | + (self.member3_full_name!='' and self.member3_school_name=='')) | ||
|
|
|
311 | + self.errors.add_to_base("ΰΉΰΈΰΈ£ΰΈΰΈ£ΰΈ°ΰΈΰΈΈΰΈΰΈ·ΰΉΰΈΰΉΰΈ£ΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈΰΈͺΰΈ³ΰΈ«ΰΈ£ΰΈ±ΰΈΰΈͺΰΈ‘ΰΈ²ΰΈΰΈ΄ΰΈΰΉΰΈΰΈΰΈ΅ΰΈ‘ΰΈΰΈΈΰΈΰΈΰΈ") | ||
|
|
|
312 | + end | ||
|
|
|
313 | + end | ||
|
|
|
314 | + end | ||
|
|
298 | end |
|
315 | end |
| @@ -20,11 +20,10 | |||||
|
|
20 | .problem-list |
|
20 | .problem-list |
|
|
21 | = render :partial => 'problem_title', :collection => @problems, :as => :problem |
|
21 | = render :partial => 'problem_title', :collection => @problems, :as => :problem |
|
|
22 | .problem-content |
|
22 | .problem-content |
|
|
23 | - - if @current_problem_id==nil |
|
23 | + %span{:id => "problem-panel-filler", :style => (@current_problem_id!=nil) ? "display:none" : ""} |
|
|
24 | - %span{:id => "problem-panel-filler"} |
|
24 | + %b Welcome to Code Jom |
|
|
25 | - %b Welcome to Code Jom |
|
25 | + %br/ |
|
|
26 | - %br/ |
|
26 | + Choose problems from the list on the right. |
|
|
27 | - Choose problems from the list on the right. |
|
||
|
|
28 | = render :partial => 'problem', :collection => @problems |
|
27 | = render :partial => 'problem', :collection => @problems |
|
|
29 |
|
28 | ||
|
|
30 | %br{:clear=>'both'}/ |
|
29 | %br{:clear=>'both'}/ |
| @@ -32,6 +32,39 | |||||
|
|
32 | %small |
|
32 | %small |
|
|
33 | =t 'registration.email_guide' |
|
33 | =t 'registration.email_guide' |
|
|
34 | %tr |
|
34 | %tr |
|
|
|
35 | + %td{:align => "right"} | ||
|
|
|
36 | + ΰΈΰΈ£ΰΈ°ΰΉΰΈ ΰΈΰΈΰΈ²ΰΈ£ΰΈͺΰΈ‘ΰΈ±ΰΈΰΈ£: | ||
|
|
|
37 | + %td | ||
|
|
|
38 | + =select :user, :high_school, [['ΰΈ£ΰΈ°ΰΈΰΈ±ΰΈΰΈ‘ΰΈ±ΰΈΰΈ’ΰΈ‘ΰΈ¨ΰΈΆΰΈΰΈ©ΰΈ²',true], ['ΰΈΰΈΈΰΈΰΈΰΈ₯ΰΈΰΈ±ΰΉΰΈ§ΰΉΰΈ',false]] | ||
|
|
|
39 | + %tr | ||
|
|
|
40 | + %td{:align => "right"} | ||
|
|
|
41 | + ΰΈΰΈ·ΰΉΰΈ-ΰΈΰΈ²ΰΈ‘ΰΈͺΰΈΰΈΈΰΈ₯ΰΈͺΰΈ‘ΰΈ²ΰΈΰΈ΄ΰΈΰΈΰΈΰΉΰΈ£ΰΈ: | ||
|
|
|
42 | + %td | ||
|
|
|
43 | + = f.text_field :member1_full_name | ||
|
|
|
44 | + ΰΉΰΈ£ΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈ: | ||
|
|
|
45 | + = f.text_field :member1_school_name | ||
|
|
|
46 | + %tr | ||
|
|
|
47 | + %td{:align => "right"} | ||
|
|
|
48 | + ΰΈΰΈ·ΰΉΰΈ-ΰΈΰΈ²ΰΈ‘ΰΈͺΰΈΰΈΈΰΈ₯ΰΈͺΰΈ‘ΰΈ²ΰΈΰΈ΄ΰΈΰΈΰΈΰΈΰΈ΅ΰΉΰΈͺΰΈΰΈ: | ||
|
|
|
49 | + %td | ||
|
|
|
50 | + = f.text_field :member2_full_name | ||
|
|
|
51 | + ΰΉΰΈ£ΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈ: | ||
|
|
|
52 | + = f.text_field :member2_school_name | ||
|
|
|
53 | + %tr | ||
|
|
|
54 | + %td{:align => "right"} | ||
|
|
|
55 | + ΰΈΰΈ·ΰΉΰΈ-ΰΈΰΈ²ΰΈ‘ΰΈͺΰΈΰΈΈΰΈ₯ΰΈͺΰΈ‘ΰΈ²ΰΈΰΈ΄ΰΈΰΈΰΈΰΈΰΈ΅ΰΉΰΈͺΰΈ²ΰΈ‘: | ||
|
|
|
56 | + %td | ||
|
|
|
57 | + = f.text_field :member3_full_name | ||
|
|
|
58 | + ΰΉΰΈ£ΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈ: | ||
|
|
|
59 | + = f.text_field :member3_school_name | ||
|
|
|
60 | + %tr | ||
|
|
|
61 | + %td | ||
|
|
|
62 | + %td | ||
|
|
|
63 | + %small | ||
|
|
|
64 | + ΰΈ ΰΈ²ΰΈ’ΰΉΰΈΰΈΰΈ΅ΰΈ‘ΰΉΰΈ‘ΰΉΰΈΰΈ³ΰΉΰΈΰΉΰΈΰΈΰΉΰΈΰΈΰΈ‘ΰΈ΅ΰΈͺΰΈ‘ΰΈ²ΰΈΰΈ΄ΰΈΰΈΰΈ£ΰΈ 3 ΰΈΰΈ | ||
|
|
|
65 | + | ||
|
|
|
66 | + | ||
|
|
|
67 | + %tr | ||
|
|
35 | %td/ |
|
68 | %td/ |
|
|
36 | %td |
|
69 | %td |
|
|
37 | = submit_tag((t 'registration.register'), :name => 'commit') |
|
70 | = submit_tag((t 'registration.register'), :name => 'commit') |
| @@ -5,8 +5,8 | |||||
|
|
5 | cancel: 'ΰΈ’ΰΈΰΉΰΈ₯ΰΈ΄ΰΈ' |
|
5 | cancel: 'ΰΈ’ΰΈΰΉΰΈ₯ΰΈ΄ΰΈ' |
|
|
6 |
|
6 | ||
|
|
7 | login_label: 'ΰΈΰΈ·ΰΉΰΈΰΉΰΈΰΉΰΈ²ΰΉΰΈΰΉΰΈ£ΰΈ°ΰΈΰΈ (login)' |
|
7 | login_label: 'ΰΈΰΈ·ΰΉΰΈΰΉΰΈΰΉΰΈ²ΰΉΰΈΰΉΰΈ£ΰΈ°ΰΈΰΈ (login)' |
|
|
8 |
- full_name_label: 'ΰΈΰΈ·ΰΉΰΈ |
|
8 | + full_name_label: 'ΰΈΰΈ·ΰΉΰΈΰΈΰΈ΅ΰΈ‘' |
|
|
9 | - email_label: 'E-mail' |
|
9 | + email_label: 'E-mail ΰΈͺΰΈ³ΰΈ«ΰΈ£ΰΈ±ΰΈΰΈΰΈ΄ΰΈΰΈΰΉΰΈ' |
|
|
10 | password_label: 'ΰΈ£ΰΈ«ΰΈ±ΰΈͺΰΈΰΉΰΈ²ΰΈ' |
|
10 | password_label: 'ΰΈ£ΰΈ«ΰΈ±ΰΈͺΰΈΰΉΰΈ²ΰΈ' |
|
|
11 |
|
11 | ||
|
|
12 | go_ahead_to: "ΰΉΰΈΰΈ’ΰΈ±ΰΈ" |
|
12 | go_ahead_to: "ΰΉΰΈΰΈ’ΰΈ±ΰΈ" |
| @@ -56,15 +56,15 | |||||
|
|
56 |
|
56 | ||
|
|
57 | registration: |
|
57 | registration: |
|
|
58 | title: "ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈΰΈΰΈΉΰΉΰΉΰΈΰΉΰΉΰΈ«ΰΈ‘ΰΉ" |
|
58 | title: "ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈΰΈΰΈΉΰΉΰΉΰΈΰΉΰΉΰΈ«ΰΈ‘ΰΉ" |
|
|
59 |
- description: "ΰΉΰΈΰΈΰΈ²ΰΈ£ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈ ΰΉΰΈ«ΰΉΰΈΰΈΉΰΉΰΈͺΰΈΰΉΰΈΰΉΰΈΰΉΰΈ²ΰΈ£ΰΉΰΈ§ΰΈ‘ΰΈΰΈ²ΰΈ£ΰΉΰΈΰΉΰΈΰΈΰΈ±ΰΈΰΈΰΈ£ΰΈΰΈΰΈΰΉΰΈΰΈ‘ΰΈΉΰΈ₯ΰΈΰΉΰΈ²ΰΈΰΈ₯ΰΉΰΈ²ΰΈ ΰΈΰΈ²ΰΈΰΈΰΈ±ΰΉΰΈΰΈ£ΰΈ°ΰΈΰΈΰΈΰΈ°ΰΈͺΰΉΰΈ e-mail ΰΉΰΈΰΈ’ΰΈ±ΰΈ e-mail ΰΈΰΈ΅ΰΉΰΈ£ΰΈ°ΰΈΰΈΈΰΉΰΈΰΈ·ΰΉΰΈΰΉΰΈ«ΰΉΰΈ’ΰΈ·ΰΈΰΈ’ΰΈ±ΰΈΰΈΰΈ±ΰΈ§ΰΈΰΈΰΉΰΈ₯ΰΈ°ΰΉΰΈΰΈ΄ΰΈΰΉΰΈΰΉΰΈΰΈ±ΰΈΰΈΰΈ΅ΰΈΰΈΉΰΉΰΉΰΈΰΉ<br/>ΰΉΰΈΰΈΰΈ£ΰΈΰΈ΅ΰΈΰΈ΅ΰΉΰΈΰΈΉΰΉΰΉΰΈΰΉΰΈ²ΰΉΰΈΰΉΰΈΰΈΰΈ±ΰΈΰΉΰΈΰΉΰΈΰΈΰΈ±ΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈ ΰΈ£ΰΈΰΈΰΈ§ΰΈΰΈΰΉΰΈ§ΰΈ’ΰΉΰΈ«ΰΉΰΈΰΉΰΈΰΈ‘ΰΈΉΰΈ₯ΰΉΰΈΰΈ΅ΰΉΰΈ’ΰΈ§ΰΈΰΈ±ΰΈΰΉΰΈ£ΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈ |
|
59 | + description: "ΰΉΰΈΰΈΰΈ²ΰΈ£ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈ ΰΉΰΈ«ΰΉΰΈΰΈΉΰΉΰΈͺΰΈΰΉΰΈΰΉΰΈΰΉΰΈ²ΰΈ£ΰΉΰΈ§ΰΈ‘ΰΈΰΈ²ΰΈ£ΰΉΰΈΰΉΰΈΰΈΰΈ±ΰΈΰΈΰΈ£ΰΈΰΈΰΈΰΉΰΈΰΈ‘ΰΈΉΰΈ₯ΰΈΰΉΰΈ²ΰΈΰΈ₯ΰΉΰΈ²ΰΈ ΰΈΰΈ²ΰΈΰΈΰΈ±ΰΉΰΈΰΈ£ΰΈ°ΰΈΰΈΰΈΰΈ°ΰΈͺΰΉΰΈ e-mail ΰΉΰΈΰΈ’ΰΈ±ΰΈ e-mail ΰΈΰΈ΅ΰΉΰΈ£ΰΈ°ΰΈΰΈΈΰΉΰΈΰΈ·ΰΉΰΈΰΉΰΈ«ΰΉΰΈ’ΰΈ·ΰΈΰΈ’ΰΈ±ΰΈΰΈΰΈ±ΰΈ§ΰΈΰΈΰΉΰΈ₯ΰΈ°ΰΉΰΈΰΈ΄ΰΈΰΉΰΈΰΉΰΈΰΈ±ΰΈΰΈΰΈ΅ΰΈΰΈΉΰΉΰΉΰΈΰΉ<br/>ΰΉΰΈΰΈΰΈ£ΰΈΰΈ΅ΰΈΰΈ΅ΰΉΰΈΰΈΉΰΉΰΉΰΈΰΉΰΈ²ΰΉΰΈΰΉΰΈΰΈΰΈ±ΰΈΰΉΰΈΰΉΰΈΰΈΰΈ±ΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈ ΰΈ£ΰΈΰΈΰΈ§ΰΈΰΈΰΉΰΈ§ΰΈ’ΰΉΰΈ«ΰΉΰΈΰΉΰΈΰΈ‘ΰΈΉΰΈ₯ΰΉΰΈΰΈ΅ΰΉΰΈ’ΰΈ§ΰΈΰΈ±ΰΈΰΉΰΈ£ΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈΰΈΰΉΰΈ§ΰΈ’" |
|
|
60 |
|
60 | ||
|
|
61 | successful_title: "ΰΈΰΈ²ΰΈ£ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈΰΉΰΈͺΰΈ£ΰΉΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈΰΈ£ΰΉΰΈΰΈ’" |
|
61 | successful_title: "ΰΈΰΈ²ΰΈ£ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈΰΉΰΈͺΰΈ£ΰΉΰΈΰΉΰΈ£ΰΈ΅ΰΈ’ΰΈΰΈ£ΰΉΰΈΰΈ’" |
|
|
62 |
|
62 | ||
|
|
63 | - login_guide: "ΰΉΰΈΰΉΰΉΰΈΰΉΰΉΰΈΰΈΰΈ²ΰΈ° a-z, A-Z, 0-9 ΰΉΰΈ₯ΰΈ° _ ΰΈΰΈ§ΰΈ²ΰΈ‘ΰΈ’ΰΈ²ΰΈ§ΰΉΰΈ‘ΰΉΰΉΰΈΰΈ΄ΰΈ 20 ΰΈΰΈ±ΰΈ§ΰΈΰΈ±ΰΈΰΈ©ΰΈ£" |
|
63 | + login_guide: "ΰΉΰΈΰΉΰΉΰΈΰΉΰΉΰΈΰΈΰΈ²ΰΈ° a-z, A-Z, 0-9 ΰΉΰΈ₯ΰΈ° _ ΰΈΰΈ§ΰΈ²ΰΈ‘ΰΈ’ΰΈ²ΰΈ§ΰΉΰΈ‘ΰΉΰΉΰΈΰΈ΄ΰΈ 20 ΰΈΰΈ±ΰΈ§ΰΈΰΈ±ΰΈΰΈ©ΰΈ£ ΰΈΰΈ·ΰΉΰΈΰΈΰΈ΅ΰΉΰΈΰΈ°ΰΉΰΈΰΉΰΉΰΈͺΰΈΰΈΰΉΰΈΰΈΰΈ£ΰΈ°ΰΈΰΈ²ΰΈΰΉΰΈͺΰΈΰΈΰΈΰΈ₯" |
|
|
64 | email_guide: "ΰΈΰΈ£ΰΈΈΰΈΰΈ²ΰΈΰΈ£ΰΈ§ΰΈΰΈͺΰΈΰΈ e-mail ΰΈΰΈ΅ΰΉΰΉΰΈͺΰΉΰΉΰΈ«ΰΉΰΈΰΈΉΰΈΰΈΰΉΰΈΰΈ<br/>ΰΈΰΈΈΰΈΰΈΰΈ°ΰΈΰΉΰΈΰΈΰΈ’ΰΈ·ΰΈΰΈ’ΰΈ±ΰΈΰΈΰΈ²ΰΈ£ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈΰΈΰΉΰΈ²ΰΈΰΈΰΈ²ΰΈΰΈΰΉΰΈΰΈ‘ΰΈΉΰΈ₯ΰΈΰΈ΅ΰΉΰΈΰΈ°ΰΈͺΰΉΰΈΰΉΰΈ«ΰΉΰΈΰΈ²ΰΈ e-mail" |
|
64 | email_guide: "ΰΈΰΈ£ΰΈΈΰΈΰΈ²ΰΈΰΈ£ΰΈ§ΰΈΰΈͺΰΈΰΈ e-mail ΰΈΰΈ΅ΰΉΰΉΰΈͺΰΉΰΉΰΈ«ΰΉΰΈΰΈΉΰΈΰΈΰΉΰΈΰΈ<br/>ΰΈΰΈΈΰΈΰΈΰΈ°ΰΈΰΉΰΈΰΈΰΈ’ΰΈ·ΰΈΰΈ’ΰΈ±ΰΈΰΈΰΈ²ΰΈ£ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈΰΈΰΉΰΈ²ΰΈΰΈΰΈ²ΰΈΰΈΰΉΰΈΰΈ‘ΰΈΉΰΈ₯ΰΈΰΈ΅ΰΉΰΈΰΈ°ΰΈͺΰΉΰΈΰΉΰΈ«ΰΉΰΈΰΈ²ΰΈ e-mail" |
|
|
65 | register: "ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈ" |
|
65 | register: "ΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈ" |
|
|
66 |
|
66 | ||
|
|
67 |
- email_body: "ΰΈͺΰΈ§ΰΈ±ΰΈͺΰΈΰΈ΅ |
|
67 | + email_body: "ΰΈͺΰΈ§ΰΈ±ΰΈͺΰΈΰΈ΅ ΰΈΰΈ΅ΰΈ‘ {{full_name}}, |
|
|
68 |
|
68 | ||
|
|
69 | ΰΈΰΈΈΰΈΰΉΰΈΰΉΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈΰΉΰΈΰΉΰΈ²ΰΈ£ΰΉΰΈ§ΰΈ‘ΰΈΰΈ²ΰΈ£ΰΉΰΈΰΉΰΈΰΈΰΈ±ΰΈ {{contest_name}} |
|
69 | ΰΈΰΈΈΰΈΰΉΰΈΰΉΰΈ₯ΰΈΰΈΰΈ°ΰΉΰΈΰΈ΅ΰΈ’ΰΈΰΉΰΈΰΉΰΈ²ΰΈ£ΰΉΰΈ§ΰΈ‘ΰΈΰΈ²ΰΈ£ΰΉΰΈΰΉΰΈΰΈΰΈ±ΰΈ {{contest_name}} |
|
|
70 |
|
70 | ||
| @@ -135,4 +135,7 | |||||
|
|
135 | full_name: "ΰΈΰΈ·ΰΉΰΈΰΉΰΈΰΉΰΈ‘" |
|
135 | full_name: "ΰΈΰΈ·ΰΉΰΈΰΉΰΈΰΉΰΈ‘" |
|
|
136 | email: "e-mail" |
|
136 | email: "e-mail" |
|
|
137 | province: "ΰΈΰΈ±ΰΈΰΈ«ΰΈ§ΰΈ±ΰΈ" |
|
137 | province: "ΰΈΰΈ±ΰΈΰΈ«ΰΈ§ΰΈ±ΰΈ" |
|
|
138 | - |
|
138 | + member1_full_name: "ΰΈΰΈ·ΰΉΰΈ-ΰΈΰΈ²ΰΈ‘ΰΈͺΰΈΰΈΈΰΈ₯ΰΈͺΰΈ‘ΰΈ²ΰΈΰΈ΄ΰΈΰΈΰΈΰΉΰΈ£ΰΈ" |
|
|
|
139 | + member2_full_name: "ΰΈΰΈ·ΰΉΰΈ-ΰΈΰΈ²ΰΈ‘ΰΈͺΰΈΰΈΈΰΈ₯ΰΈͺΰΈ‘ΰΈ²ΰΈΰΈ΄ΰΈΰΈΰΈΰΈΰΈ΅ΰΉΰΈͺΰΈΰΈ" | ||
|
|
|
140 | + member3_full_name: "ΰΈΰΈ·ΰΉΰΈ-ΰΈΰΈ²ΰΈ‘ΰΈͺΰΈΰΈΈΰΈ₯ΰΈͺΰΈ‘ΰΈ²ΰΈΰΈ΄ΰΈΰΈΰΈΰΈΰΈ΅ΰΉΰΈͺΰΈ²ΰΈ‘" | ||
|
|
|
141 | + No newline at end of file | ||
| @@ -9,7 +9,7 | |||||
|
|
9 | # |
|
9 | # |
|
|
10 | # It's strongly recommended to check this file into your version control system. |
|
10 | # It's strongly recommended to check this file into your version control system. |
|
|
11 |
|
11 | ||
|
|
12 |
- ActiveRecord::Schema.define(:version => 2010012 |
|
12 | + ActiveRecord::Schema.define(:version => 20100126170609) do |
|
|
13 |
|
13 | ||
|
|
14 | create_table "announcements", :force => true do |t| |
|
14 | create_table "announcements", :force => true do |t| |
|
|
15 | t.string "author" |
|
15 | t.string "author" |
| @@ -223,17 +223,24 | |||||
|
|
223 | end |
|
223 | end |
|
|
224 |
|
224 | ||
|
|
225 | create_table "users", :force => true do |t| |
|
225 | create_table "users", :force => true do |t| |
|
|
226 | - t.string "login", :limit => 50 |
|
226 | + t.string "login", :limit => 50 |
|
|
227 | t.string "full_name" |
|
227 | t.string "full_name" |
|
|
228 | t.string "hashed_password" |
|
228 | t.string "hashed_password" |
|
|
229 | - t.string "salt", :limit => 5 |
|
229 | + t.string "salt", :limit => 5 |
|
|
230 | t.string "alias" |
|
230 | t.string "alias" |
|
|
231 | t.string "email" |
|
231 | t.string "email" |
|
|
232 | t.integer "site_id" |
|
232 | t.integer "site_id" |
|
|
233 | t.integer "country_id" |
|
233 | t.integer "country_id" |
|
|
234 | - t.boolean "activated", :default => false |
|
234 | + t.boolean "activated", :default => false |
|
|
235 | t.datetime "created_at" |
|
235 | t.datetime "created_at" |
|
|
236 | t.datetime "updated_at" |
|
236 | t.datetime "updated_at" |
|
|
|
237 | + t.string "member1_full_name" | ||
|
|
|
238 | + t.string "member2_full_name" | ||
|
|
|
239 | + t.string "member3_full_name" | ||
|
|
|
240 | + t.boolean "high_school" | ||
|
|
|
241 | + t.string "member1_school_name" | ||
|
|
|
242 | + t.string "member2_school_name" | ||
|
|
|
243 | + t.string "member3_school_name" | ||
|
|
237 | end |
|
244 | end |
|
|
238 |
|
245 | ||
|
|
239 | add_index "users", ["login"], :name => "index_users_on_login", :unique => true |
|
246 | add_index "users", ["login"], :name => "index_users_on_login", :unique => true |
You need to be logged in to leave comments.
Login now