cafe-grader-web Commit - r535:a0fe4acdb4ed

cafe-grader-web

Commit `r535:a0fe4acdb4ed` public

parent | child

Description:

add license agreement checkbox

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r535:a0fe4acdb4ed - Mon, 14 Sep 2015 22:36:20 - 3 files changed: 10 inserted, 2 deleted

app/controllers/login_controller.rb ¶ +4 -1

               class LoginController < ApplicationController
                 def index
                   # show login screen
                   reset_session
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 def login
-            -     if user = User.authenticate(params[:login], params[:password])
+            +     if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree])
+            +       flash[:notice] = 'You must accept the agreement before logging in'
+            +       redirect_to :controller => 'main', :action => 'login'
+            +     elsif user = User.authenticate(params[:login], params[:password])
                     session[:user_id] = user.id
                     session[:admin] = user.admin?
                     # clear forced logout flag for multicontests contest change
                     if GraderConfiguration.multicontests?
                       contest_stat = user.contest_stat
                       if contest_stat.respond_to? :forced_logout
                         if contest_stat.forced_logout
                           contest_stat.forced_logout = false
                           contest_stat.save
                         end
                       end
                     end
                     #save login information
                     Login.create(user_id: user.id, ip_address: request.remote_ip)
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     flash[:notice] = 'Wrong password'
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end

app/views/main/_login_box.html.haml ¶ +5

               %b= GraderConfiguration['ui.front.welcome_message']
               %br/
               - if !@hidelogin
                 =t 'login.message'
                 %br/
                 %br/
                 - if flash[:notice]
                   %hr/
                   %b= flash[:notice]
                   %hr/
                 %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
                   = form_tag :controller => 'login', :action => 'login' do
                     %table
                       %tr
                         %td{:align => "right"}
                           ="#{t 'login_label'}:"
                         %td= text_field_tag 'login'
                       %tr
                         %td{:align => "right"}
                           ="#{t 'password_label'}:"
                         %td= password_field_tag
+            +         - unless GraderConfiguration['right.bypass_agreement']
+            +           %tr
+            +             %td{:align => "right"}= check_box_tag 'accept_agree'
+            +             %td ยอมรับข้อตกลงการใช้งาน
+            +
                     = submit_tag t('login.login_submit')
               %br/
               - if GraderConfiguration['system.online_registration']
                 =t 'login.participation'
                 %b
                   = "#{t 'login.please'} "
                   = link_to "#{t 'login.register'}", :controller => :users, :action => :new
                 %br/
                 = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget

db/schema.rb ¶ +1 -1

               # encoding: UTF-8
               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record 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 => 20150914155101) do
+            + ActiveRecord::Schema.define(:version => 20150914223258) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body",         :limit => 16777215
                   t.boolean  "published"
                   t.datetime "created_at",                                          :null => false
                   t.datetime "updated_at",                                          :null => false
                   t.boolean  "frontpage",                        :default => false
                   t.boolean  "contest_only",                     :default => false
                   t.string   "title"
                   t.string   "notes"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.boolean  "enabled"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.string   "name"
                 end
                 create_table "contests_problems", :id => false, :force => true do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"

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

r535:a0fe4acdb4ed - Mon, 14 Sep 2015 22:36:20 - 3 files changed: 10 inserted, 2 deleted

Sign in to your account

Commit r535:a0fe4acdb4ed public

Author

r535:a0fe4acdb4ed - Mon, 14 Sep 2015 22:36:20 - 3 files changed: 10 inserted, 2 deleted

Commit `r535:a0fe4acdb4ed` public