cafe-grader-web Commit - r783:f1343ca4b141

cafe-grader-web

parent | child

Description:

add ip to front page, also fix seeds.rb

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r783:f1343ca4b141 - Mon, 04 Nov 2019 07:01:47 - 3 files changed: 3 inserted, 1 deleted

app/controllers/main_controller.rb ¶ +1

                 #reset login, clear session
                 #front page
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash.now[:notice] = saved_notice
+            +     @remote_ip = request.remote_ip
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"

app/views/main/login.html.haml ¶ +1

                     .announcementbox{:style => 'margin-top: 0px'}
                       %span{:class => 'title'}
                         Announcements
                       = render :partial => 'announcement', :collection => @announcements
                 .col-md-4{style: "padding-left: 20px;"}
                   = render :partial => 'login_box'
+            +     = "current ip is #{@remote_ip}"

db/seeds.rb ¶ +1 -1

               def seed_users_and_roles
                 seed_roles
                 seed_root
               end
               def seed_more_languages
-            -   Language.delete_all
+            +   #Language.delete_all
                 Language.find_or_create_by( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' )
                 Language.find_or_create_by( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' )
                 Language.find_or_create_by( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' )
                 Language.find_or_create_by( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' )
                 Language.find_or_create_by( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' )
                 Language.find_or_create_by( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' )

You need to be logged in to leave comments. Login now

	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