cafe-grader-web Commit - r786:4e030454953c

cafe-grader-web

Commit `r786:4e030454953c` public

parent | child

Description:

remove lingering debug info

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

r786:4e030454953c - Mon, 04 Nov 2019 10:06:21 - 3 files changed: 0 inserted, 6 deleted

app/controllers/application_controller.rb ¶ -1

                   unless GraderConfiguration[MULTIPLE_IP_LOGIN_CONF_KEY]
                     user = User.find(session[:user_id])
                     if (!user.admin? && user.last_ip && user.last_ip != request.remote_ip)
                       flash[:notice] = "You cannot use the system from #{request.remote_ip}. Your last ip is #{user.last_ip}"
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
                     unless user.last_ip
                       user.last_ip = request.remote_ip
                       user.save
                     end
                   end
                   return true
                 end
                 def authorization
                   return false unless check_valid_login
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role|
                       role.rights.detect{ |right|
                         right.controller == self.class.controller_name and
                           (right.action == 'all' || right.action == action_name)
                       }
                     }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login')
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end
                 def verify_time_limit
                   return true if session[:user_id]==nil
                   user = User.find(session[:user_id], :include => :site)
                   return true if user==nil || user.site == nil
                   if user.contest_finished?
                     flash[:notice] = 'Error: the contest you are participating is over.'
                     redirect_to :back
                     return false
                   end
                   return true
                 end
                 def is_request_ip_allowed?
                   unless GraderConfiguration[WHITELIST_IGNORE_CONF_KEY]
                     user_ip = IPAddr.new(request.remote_ip)
                     GraderConfiguration[WHITELIST_IP_CONF_KEY].delete(' ').split(',').each do |ips|
-            -         puts "ip is #{ips}, user ip is #{user_ip}"
                       allow_ips = IPAddr.new(ips)
                       if allow_ips.include?(user_ip)
                         return true
                       end
                     end
                     return false
                   end
                   return true
                 end
               end

app/controllers/submissions_controller.rb ¶ -3

                   @submission = Submission.find(params[:id])
                   #log the viewing
                   user = User.find(session[:user_id])
                   SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
                   @task = @submission.task
                 end
                 def download
                   @submission = Submission.find(params[:id])
                   send_data(@submission.source, {:filename => @submission.download_filename, :type => 'text/plain'})
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   respond_to do |format|
                     format.js
                   end
                 end
                 #on-site new submission on specific problem
                 def direct_edit_problem
                   @problem = Problem.find(params[:problem_id])
                   unless @current_user.can_view_problem?(@problem)
                     unauthorized_redirect
                     return
                   end
                   @source = ''
                   if (params[:view_latest])
                     sub = Submission.find_last_by_user_and_problem(@current_user.id,@problem.id)
                     @source = @submission.source.to_s if @submission and @submission.source
                   end
                   render 'edit'
                 end
                 # GET /submissions/1/edit
                 def edit
                   @submission = Submission.find(params[:id])
                   @source = @submission.source.to_s
                   @problem = @submission.problem
                   @lang_id = @submission.language.id
                 end
                 def get_latest_submission_status
                   @problem = Problem.find(params[:pid])
                   @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
-            -     puts User.find(params[:uid]).login
-            -     puts Problem.find(params[:pid]).name
-            -     puts 'nil' unless @submission
                   respond_to do |format|
                     format.js
                   end
                 end
                 # GET /submissions/:id/rejudge
                 def rejudge
                   @submission = Submission.find(params[:id])
                   @task = @submission.task
                   @task.status_inqueue! if @task
                   respond_to do |format|
                     format.js
                   end
                 end
               protected
                 def submission_authorization
                   #admin always has privileged
                   if @current_user.admin?
                     return true
                   end
                   sub = Submission.find(params[:id])
                   if @current_user.available_problems.include? sub.problem
                     return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
                   end
                   #default to NO
                   unauthorized_redirect
                   return false
                 end
               end

app/views/report/_score_table.html.haml ¶ -2

               %table.table.sortable.table-striped.table-bordered.table-condensed
                 %thead
                   %tr
                     %th Login
                     %th Name
                     / %th Activated?
                     / %th Logged_in
                     / %th Contest(s)
                     %th Remark
                     - @problems.each do |p|
                       %th.text-right= p.name.gsub('_',' ')
                     %th.text-right Total
                     %th.text-right Passed
                 %tbody
                   - sum = Array.new(@problems.count+1,0)
                   - nonzero = Array.new(@problems.count+1,0)
                   - full = Array.new(@problems.count+1,0)
-            -     - puts @scorearray
-            -     - puts @problems.count
                   - @scorearray.each do |sc|
                     %tr
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= link_to sc[i].login, stat_user_path(sc[i])
                           %td= sc[i].full_name
                           / %td= sc[i].activated
                           / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
                           / %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
                           %td.text-right= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
                           - sum[i] += sc[i][0]
                           - nonzero[i] += 1 if sc[i][0] > 0
                           - full[i] += 1 if sc[i][1]
                       %td.text-right= total
                       %td.text-right= num_passed
                   %tfoot
                     %tr
                       %td Summation
                       %td
                       %td
                       - sum.each.with_index do |s,i|
                         - next if i == 0
                         %td.text-right= number_with_delimiter(s)
                       %td
                       %td
                     %tr
                       %td partial solver
                       %td
                       %td
                       - nonzero.each.with_index do |s,i|
                         - next if i == 0
                         %td.text-right= number_with_delimiter(s)
                       %td
                       %td
                     %tr
                       %td Full solver
                       %td
                       %td
                       - full.each.with_index do |s,i|
                         - next if i == 0
                         %td.text-right= number_with_delimiter(s)
                       %td
                       %td

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

r786:4e030454953c - Mon, 04 Nov 2019 10:06:21 - 3 files changed: 0 inserted, 6 deleted

Sign in to your account

Commit r786:4e030454953c public

Author

r786:4e030454953c - Mon, 04 Nov 2019 10:06:21 - 3 files changed: 0 inserted, 6 deleted

Commit `r786:4e030454953c` public