cafe-grader-web Commit - r288:74436ad04ad0

cafe-grader-web

Commit `r288:74436ad04ad0` public

parent | child

Description:

controllers get available problems from current user

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r288:74436ad04ad0 - Thu, 11 Mar 2010 08:18:40 - 3 files changed: 42 inserted, 45 deleted

app/controllers/main_controller.rb ¶ +3 -44

                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def submission
                   @user = User.find(session[:user_id])
-            -     @problems = Problem.find_available_problems
+            +     @problems = @user.available_problems
                   if params[:id]==nil
                     @problem = nil
                     @submissions = nil
                   else
                     @problem = Problem.find_by_name(params[:id])
                     if not @problem.available
                       redirect_to :action => 'list'
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
                   end
                 def prepare_announcements(recent=nil)
                   if Configuration.show_tasks_to?(@user)
                     @announcements = Announcement.find_published(true)
                   else
                     @announcements = Announcement.find_published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
-            -   def problem_list_by_user_contests(user)
-            -     contest_problems = []
-            -     pin = {}
-            -     user.contests.enabled.each do |contest|
-            -       available_problems = contest.problems.available
-            -       contest_problems << {
-            -         :contest => contest,
-            -         :problems => available_problems
-            -       }
-            -       available_problems.each {|p| pin[p.id] = true}
-            -     end
-            -     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
-            -     contest_problems << {
-            -       :contest => nil,
-            -       :problems => other_avaiable_problems
-            -     }
-            -     return contest_problems
-            -   end
-            -   def problem_list_for_user(user, contest_problems=nil)
-            -     if not Configuration.multicontests?
-            -       return Problem.find_available_problems
-            -     else
-            -       if contest_problems==nil
-            -         contest_problems = problem_list_by_user_contests(user)
-            -       end
-            -       problems = []
-            -       collected = {}
-            -       contest_problems.each do |cp|
-            -         cp[:problems].each do |problem|
-            -           if not collected[problem.id]
-            -             problems << problem
-            -             collected[problem.id] = true
-            -           end
-            -         end
-            -       end
-            -       return problems
-            -     end
-            -   end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   if not Configuration.multicontests?
                     @problems = problem_list_for_user(@user)
                   else
-            -       @contest_problems = problem_list_by_user_contests(@user)
+            +       @contest_problems = @user.available_problems_group_by_contests
-            -       @problems = problem_list_for_user(@user, @contest_problems)
+            +       @problems = @user.available_problems
                   end
                   @prob_submissions = {}
                   @problems.each do |p|
                     sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
                     if sub!=nil
                       @prob_submissions[p.id] = { :count => sub.number, :submission => sub }
                     else
                       @prob_submissions[p.id] = { :count => 0, :submission => nil }
                     end
                   end
                   prepare_announcements
                 end

app/controllers/tasks_controller.rb ¶ +1 -1

               class TasksController < ApplicationController
                 before_filter :authenticate, :check_viewability
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
-            -     @problems = Problem.find_available_problems
+            +     @problems = @user.available_problems
                 end
                 # this has contest-wide access control
                 def view
                   base_name = params[:file]
                   base_filename = File.basename("#{base_name}.#{params[:ext]}")
                   filename = "#{Problem.download_file_basedir}/#{base_filename}"
                   if !FileTest.exists?(filename)
                     redirect_to :action => 'index' and return
                   end

app/models/user.rb ¶ +38

@@ -188,24 +188,62
188	if problem_contests.length == 0 # this is public contest	188	if problem_contests.length == 0 # this is public contest
189	return true	189	return true
190	end	190	end
191		191
192	contests.each do \|contest\|	192	contests.each do \|contest\|
193	if problem_contests.find {\|c\| c.id == contest.id }	193	if problem_contests.find {\|c\| c.id == contest.id }
194	return true	194	return true
195	end	195	end
196	end	196	end
197	return false	197	return false
198	end	198	end
199		199
		200	+ def available_problems_group_by_contests
		201	+ contest_problems = []
		202	+ pin = {}
		203	+ contests.enabled.each do \|contest\|
		204	+ available_problems = contest.problems.available
		205	+ contest_problems << {
		206	+ :contest => contest,
		207	+ :problems => available_problems
		208	+ }
		209	+ available_problems.each {\|p\| pin[p.id] = true}
		210	+ end
		211	+ other_avaiable_problems = Problem.available.find_all {\|p\| pin[p.id]==nil and p.contests.length==0}
		212	+ contest_problems << {
		213	+ :contest => nil,
		214	+ :problems => other_avaiable_problems
		215	+ }
		216	+ return contest_problems
		217	+ end
		218	+
		219	+ def available_problems
		220	+ if not Configuration.multicontests?
		221	+ return Problem.find_available_problems
		222	+ else
		223	+ contest_problems = []
		224	+ pin = {}
		225	+ contests.enabled.each do \|contest\|
		226	+ contest.problems.available.each do \|problem\|
		227	+ if not pin.has_key? problem.id
		228	+ contest_problems << problem
		229	+ end
		230	+ pin[problem.id] = true
		231	+ end
		232	+ end
		233	+ other_avaiable_problems = Problem.available.find_all {\|p\| pin[p.id]==nil and p.contests.length==0}
		234	+ return contest_problems + other_avaiable_problems
		235	+ end
		236	+ end
		237	+
200	def can_view_problem?(problem)	238	def can_view_problem?(problem)
201	if not Configuration.multicontests?	239	if not Configuration.multicontests?
202	return problem.available	240	return problem.available
203	else	241	else
204	return problem_in_user_contests? problem	242	return problem_in_user_contests? problem
205	end	243	end
206	end	244	end
207		245
208	protected	246	protected
209	def encrypt_new_password	247	def encrypt_new_password
210	return if password.blank?	248	return if password.blank?
211	self.salt = (10+rand(90)).to_s	249	self.salt = (10+rand(90)).to_s

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

r288:74436ad04ad0 - Thu, 11 Mar 2010 08:18:40 - 3 files changed: 42 inserted, 45 deleted

Sign in to your account

Commit r288:74436ad04ad0 public

Author

r288:74436ad04ad0 - Thu, 11 Mar 2010 08:18:40 - 3 files changed: 42 inserted, 45 deleted

Commit `r288:74436ad04ad0` public