cafe-grader-web

Commit r542:ac9d2c0737d1 public

parent | child
Description:
add license agreement checkbox (grafted from 93e468dab6dfc714db68d5a00d54f06b755f49bc)
Commit status:
[Not Reviewed]
References:
algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r542:ac9d2c0737d1 - - 3 files changed: 10 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -4,13 +4,16
4 # show login screen
4 # show login screen
5 reset_session
5 reset_session
6 redirect_to :controller => 'main', :action => 'login'
6 redirect_to :controller => 'main', :action => 'login'
7 end
7 end
8
8
9 def login
9 def login
10 - if user = User.authenticate(params[:login], params[:password])
10 + if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree])
11 + flash[:notice] = 'You must accept the agreement before logging in'
12 + redirect_to :controller => 'main', :action => 'login'
13 + elsif user = User.authenticate(params[:login], params[:password])
11 session[:user_id] = user.id
14 session[:user_id] = user.id
12 session[:admin] = user.admin?
15 session[:admin] = user.admin?
13
16
14 # clear forced logout flag for multicontests contest change
17 # clear forced logout flag for multicontests contest change
15 if GraderConfiguration.multicontests?
18 if GraderConfiguration.multicontests?
16 contest_stat = user.contest_stat
19 contest_stat = user.contest_stat
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -19,12 +19,17
19 ="#{t 'login_label'}:"
19 ="#{t 'login_label'}:"
20 %td= text_field_tag 'login'
20 %td= text_field_tag 'login'
21 %tr
21 %tr
22 %td{:align => "right"}
22 %td{:align => "right"}
23 ="#{t 'password_label'}:"
23 ="#{t 'password_label'}:"
24 %td= password_field_tag
24 %td= password_field_tag
25 + - unless GraderConfiguration['right.bypass_agreement']
26 + %tr
27 + %td{:align => "right"}= check_box_tag 'accept_agree'
28 + %td ยอมรับข้อตกลงการใช้งาน
29 +
25 = submit_tag t('login.login_submit')
30 = submit_tag t('login.login_submit')
26 %br/
31 %br/
27
32
28 - if GraderConfiguration['system.online_registration']
33 - if GraderConfiguration['system.online_registration']
29 =t 'login.participation'
34 =t 'login.participation'
30 %b
35 %b
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -8,13 +8,13
8 # system, you should be using db:schema:load, not running all the migrations
8 # system, you should be using db:schema:load, not running all the migrations
9 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
9 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
10 # you'll amass, the slower it'll run and the greater likelihood for issues).
10 # you'll amass, the slower it'll run and the greater likelihood for issues).
11 #
11 #
12 # It's strongly recommended to check this file into your version control system.
12 # It's strongly recommended to check this file into your version control system.
13
13
14 - ActiveRecord::Schema.define(:version => 20150914155101) do
14 + ActiveRecord::Schema.define(:version => 20150914223258) do
15
15
16 create_table "announcements", :force => true do |t|
16 create_table "announcements", :force => true do |t|
17 t.string "author"
17 t.string "author"
18 t.text "body", :limit => 16777215
18 t.text "body", :limit => 16777215
19 t.boolean "published"
19 t.boolean "published"
20 t.datetime "created_at", :null => false
20 t.datetime "created_at", :null => false
You need to be logged in to leave comments. Login now