cafe-grader-web

Commit r535:a0fe4acdb4ed public

parent | child
Description:
add license agreement checkbox
Commit status:
[Not Reviewed]
References:
java
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

r535:a0fe4acdb4ed - - 3 files changed: 10 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -7,7 +7,10
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
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -22,6 +22,11
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
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,7 +11,7
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"
You need to be logged in to leave comments. Login now