Description:
add ip to front page, also fix seeds.rb
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r783:f1343ca4b141 - - 3 files changed: 3 inserted, 1 deleted
| @@ -12,24 +12,25 | |||
|
|
12 | 12 | # system only in some tab |
|
|
13 | 13 | prepend_before_action :reject_announcement_refresh_when_logged_out, |
|
|
14 | 14 | :only => [:announcements] |
|
|
15 | 15 | |
|
|
16 | 16 | before_action :authenticate_by_ip_address, :only => [:list] |
|
|
17 | 17 | |
|
|
18 | 18 | #reset login, clear session |
|
|
19 | 19 | #front page |
|
|
20 | 20 | def login |
|
|
21 | 21 | saved_notice = flash[:notice] |
|
|
22 | 22 | reset_session |
|
|
23 | 23 | flash.now[:notice] = saved_notice |
|
|
24 | + @remote_ip = request.remote_ip | |
|
|
24 | 25 | |
|
|
25 | 26 | # EXPERIMENT: |
|
|
26 | 27 | # Hide login if in single user mode and the url does not |
|
|
27 | 28 | # explicitly specify /login |
|
|
28 | 29 | # |
|
|
29 | 30 | # logger.info "PATH: #{request.path}" |
|
|
30 | 31 | # if GraderConfiguration['system.single_user_mode'] and |
|
|
31 | 32 | # request.path!='/main/login' |
|
|
32 | 33 | # @hidelogin = true |
|
|
33 | 34 | # end |
|
|
34 | 35 | |
|
|
35 | 36 | @announcements = Announcement.frontpage |
| @@ -1,11 +1,12 | |||
|
|
1 | 1 | %h1= GraderConfiguration['ui.front.title'] |
|
|
2 | 2 | |
|
|
3 | 3 | .row |
|
|
4 | 4 | .col-md-6 |
|
|
5 | 5 | - if @announcements.length!=0 |
|
|
6 | 6 | .announcementbox{:style => 'margin-top: 0px'} |
|
|
7 | 7 | %span{:class => 'title'} |
|
|
8 | 8 | Announcements |
|
|
9 | 9 | = render :partial => 'announcement', :collection => @announcements |
|
|
10 | 10 | .col-md-4{style: "padding-left: 20px;"} |
|
|
11 | 11 | = render :partial => 'login_box' |
|
|
12 | + = "current ip is #{@remote_ip}" | |
| @@ -265,24 +265,24 | |||
|
|
265 | 265 | root.roles << Role.find_by_name('admin') |
|
|
266 | 266 | |
|
|
267 | 267 | root.activated = true |
|
|
268 | 268 | root.save |
|
|
269 | 269 | end |
|
|
270 | 270 | |
|
|
271 | 271 | def seed_users_and_roles |
|
|
272 | 272 | seed_roles |
|
|
273 | 273 | seed_root |
|
|
274 | 274 | end |
|
|
275 | 275 | |
|
|
276 | 276 | def seed_more_languages |
|
|
277 | - Language.delete_all | |
|
|
277 | + #Language.delete_all | |
|
|
278 | 278 | Language.find_or_create_by( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' ) |
|
|
279 | 279 | Language.find_or_create_by( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' ) |
|
|
280 | 280 | Language.find_or_create_by( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' ) |
|
|
281 | 281 | Language.find_or_create_by( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' ) |
|
|
282 | 282 | Language.find_or_create_by( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' ) |
|
|
283 | 283 | Language.find_or_create_by( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' ) |
|
|
284 | 284 | end |
|
|
285 | 285 | |
|
|
286 | 286 | seed_config |
|
|
287 | 287 | seed_users_and_roles |
|
|
288 | 288 | seed_more_languages |
You need to be logged in to leave comments.
Login now