cafe-grader-web Commit - r691:81655bc0fe60

cafe-grader-web

Commit `r691:81655bc0fe60` public

parent | child

Description:

add datatable - now admin can login without checking agreement

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

r691:81655bc0fe60 - Thu, 02 Nov 2017 10:32:17 - 7 files changed: 46 inserted, 19 deleted

Gemfile ¶ +3 -3

               gem 'jquery-tablesorter'
               gem 'jquery-countdown-rails'
               #syntax highlighter
               gem 'rouge'
-            - #add bootstrap
+            + #bootstrap add-ons
               gem 'bootstrap-sass', '~> 3.2.0'
               gem 'bootstrap-switch-rails'
               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
+            -
-            - #bootstrap sortable
               gem 'momentjs-rails'
               gem 'rails_bootstrap_sortable'
+            + gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
+            + gem 'jquery-datatables-rails'
               #----------- user interface -----------------
               #select 2
               gem 'select2-rails'
               #ace editor
               gem 'ace-rails-ap'

Gemfile.lock ¶ +10 -1

                     actionpack (>= 3.2)
                     railties (>= 3.2)
                   bootstrap-sass (3.2.0.2)
                     sass (~> 3.2)
                   bootstrap-switch-rails (3.3.3)
                   bootstrap-toggle-rails (2.2.1.0)
+            +     bootstrap3-datetimepicker-rails (4.17.47)
+            +       momentjs-rails (>= 2.8.1)
                   builder (3.2.2)
                   coffee-rails (4.2.1)
                     coffee-script (>= 2.2.0)
                     railties (>= 4.0.0, < 5.2.x)
                   coffee-script (2.4.1)
                     coffee-script-source
                     haml (~> 4.0.0)
                     nokogiri (~> 1.6.0)
                     ruby_parser (~> 3.5)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                   jquery-countdown-rails (2.0.2)
+            +     jquery-datatables-rails (3.4.0)
+            +       actionpack (>= 3.1)
+            +       jquery-rails
+            +       railties (>= 3.1)
+            +       sass-rails
                   jquery-rails (4.2.1)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.23.3)
                     railties (>= 3.2, < 6)
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-sass (~> 3.2.0)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
+            +   bootstrap3-datetimepicker-rails (~> 4.17.47)
                 coffee-rails
                 dynamic_form
                 fuzzy-string-match
                 haml
                 haml-rails
                 in_place_editing
                 jquery-countdown-rails
+            +   jquery-datatables-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-rails
                 mail
                 minitest-reporters
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)
                 yaml_db
               BUNDLED WITH
-            -    1.13.6
+            +    1.15.4

app/assets/javascripts/application.js ¶ +4

               //
               // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
               // GO AFTER THE REQUIRES BELOW.
               //
               //= require jquery
               //= require jquery_ujs
+            + //= require dataTables/jquery.dataTables
+            + //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
               //= require jquery-ui
               //= require bootstrap-sprockets
               //= require moment
+            + //= require moment/th
               //= require bootstrap-sortable
+            + //= require bootstrap-datetimepicker
               //= require select2
               //= require ace-rails-ap
               //= require ace/mode-c_cpp
               //= require ace/mode-python
               //= require ace/mode-ruby
               //= require ace/mode-pascal

app/assets/stylesheets/application.css.scss ¶ +2

               @import "select2";
               @import "select2-bootstrap";
               //@import bootstrap3-switch
               @import "bootstrap-toggle";
               @import "bootstrap-sortable";
+            + @import "bootstrap-datetimepicker";
+            + @import "dataTables/bootstrap/3/jquery.dataTables.bootstrap";
               //bootstrap navbar color (from)
               $bgDefault: #19197b;
               $bgHighlight: #06064b;
               $colDefault: #8e8eb4;
               $colHighlight: #ffffff;

app/controllers/login_controller.rb ¶ +12 -6

                   # show login screen
                   reset_session
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 def login
-            -     if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree])
+            +     user = User.authenticate(params[:login], params[:password])
+            +     unless user
+            +       flash[:notice] = 'Wrong password'
+            +       redirect_to :controller => 'main', :action => 'login'
+            +       return
+            +     end
+            +
+            +     if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree]) and !user.admin?
                     flash[:notice] = 'You must accept the agreement before logging in'
                     redirect_to :controller => 'main', :action => 'login'
-            -     elsif user = User.authenticate(params[:login], params[:password])
+            +       return
+            +     end
+            +
+            +     #process logging in
-                    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
-                    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
                 def site_login
                   begin
                     site = Site.find(params[:login][:site_id])
                   rescue ActiveRecord::RecordNotFound

app/controllers/user_admin_controller.rb ¶ +1

                     @users = User.all
                     @paginated = false
                   else
                     @users = User.paginate :page => params[:page]
                     @paginated = true
                   end
+            +     @users = User.all
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end
                 def active
                   sessions = ActiveRecord::SessionStore::Session.where("updated_at >= ?", 60.minutes.ago)

app/views/user_admin/index.html.haml ¶ +14 -9

                 = link_to '[Manage bulk users in contests]', :action => 'contest_management'
                 View users in:
                 - @contests.each do |contest|
                   = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
                 = link_to "[no contest]", :action => 'contests', :id => 'none'
-            - Total #{@user_count} users |
-            - - if !@paginated
-            -   Display all users.
-            -   \#{link_to '[show in pages]', :action => 'index', :page => '1'}
-            - - else
-            -   Display in pages.
-            -   \#{link_to '[display all]', :action => 'index', :page => 'all'} |
-            -   \#{will_paginate @users, :container => false}
+            + -# Total #{@user_count} users |
+            + -# - if !@paginated
+            + -#   Display all users.
+            + -#   \#{link_to '[show in pages]', :action => 'index', :page => '1'}
+            + -# - else
+            + -#   Display in pages.
+            + -#   \#{link_to '[display all]', :action => 'index', :page => 'all'} |
+            + -#   \#{will_paginate @users, :container => false}
-            - %table.table.table-hover.table-condense
+            + %table.table.table-hover.table-condense.datatable
                 %thead
                   %th Login
                   %th Full name
                   %th email
                   %th Remark
                   %th
                     %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Destroy', user_admin_destroy_path(user), data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
               = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
+            +
+            + :javascript
+            +   $('.datatable').DataTable({
+            +     'pageLength': 50
+            +   });

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

r691:81655bc0fe60 - Thu, 02 Nov 2017 10:32:17 - 7 files changed: 46 inserted, 19 deleted

Sign in to your account

Commit r691:81655bc0fe60 public

Author

r691:81655bc0fe60 - Thu, 02 Nov 2017 10:32:17 - 7 files changed: 46 inserted, 19 deleted

Commit `r691:81655bc0fe60` public