cafe-grader-web Commit - r717:6d7ccf388baa

r717:6d7ccf388baa - Tue, 05 Sep 2017 09:49:37 - 10 files changed: 12 inserted, 12 deleted

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

                     end
                     if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
                       @by_lang[lang.pretty_name][:memory] = { avail: true, user_id: sub.user_id, value: sub.peak_memory, sub_id: sub.id }
                     end
-            -       if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
+            +       if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and sub.user and
                         !sub.user.admin?
                       @by_lang[lang.pretty_name][:first] = { avail: true, user_id: sub.user_id, value: sub.submitted_at, sub_id: sub.id }
                     end
                     if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
                       @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id }

app/controllers/users_controller.rb ¶ +2 -1

                   end
                   redirect_to :action => 'forget'
                 end
                 def stat
                   @user = User.find(params[:id])
-            -     @submission = Submission.includes(:problem).where(user_id: params[:id])
+            +     @submission = Submission.joins(:problem).where(user_id: params[:id])
+            +     @submission = @submission.where('problems.available = true') unless current_user.admin?
                   range = 120
                   @histogram = { data: Array.new(range,0), summary: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   problem = Hash.new(0)

db/migrate/011_add_language_ext.rb ¶ +1 -1

               class AddLanguageExt < ActiveRecord::Migration
                 def self.up
                   add_column :languages, :ext, :string, :limit => 10
                   Language.reset_column_information
-            -     langs = Language.find(:all)
+            +     langs = Language.all
                   langs.each do |l|
                     l.ext = l.name
                     l.save
                   end
                 end

db/migrate/015_add_status_to_tasks.rb ¶ +1 -1

               class AddStatusToTasks < ActiveRecord::Migration
                 def self.up
                   add_column :tasks, :status, :integer
                   add_column :tasks, :updated_at, :datetime
                   Task.reset_column_information
-            -     Task.find(:all).each do |task|
+            +     Task.all.each do |task|
                     task.status_complete
                     task.save
                   end
                 end
                 def self.down

db/migrate/018_add_number_to_submissions.rb ¶ +1 -2

                   Submission.reset_column_information
                   last_user_id = nil
                   last_problem_id = nil
                   current_number = 0
-            -     Submission.find(:all,
+            +     Submission.order('user_id, problem_id, submitted_at').each do |submission|
-            -                     :order => 'user_id, problem_id, submitted_at').each do |submission|
                     if submission.user_id==last_user_id and submission.problem_id==last_problem_id
                       current_number += 1
                     else
                       current_number = 1
                     end
                     submission.number = current_number

db/migrate/025_add_site_to_user_and_add_default_site.rb ¶ +1 -1

                                             :started => false})
                   default_site.save!
                   add_column :users, :site_id, :integer
                   User.reset_column_information
-            -     User.find(:all).each do |user|
+            +     User.all.each do |user|
                     class << user
                       def valid?
                         true
                       end
                     end

db/migrate/028_refactor_problem_body_to_description.rb ¶ +2 -2

               class RefactorProblemBodyToDescription < ActiveRecord::Migration
                 def self.up
                   add_column :problems, :description_id, :integer
                   Problem.reset_column_information
-            -     Problem.find(:all).each do |problem|
+            +     Problem.all.each do |problem|
                     if problem.body!=nil
                       description = Description.new
                       description.body = problem.body
                       description.markdowned = false
                       description.save
                       problem.description_id = description.id
                 end
                 def self.down
                   add_column :problems, :body, :text
                   Problem.reset_column_information
-            -     Problem.find(:all).each do |problem|
+            +     Problem.all.each do |problem|
                     if problem.description_id != nil
                       problem.body = Description.find(problem.description_id).body
                       problem.save
                     end
                   end

db/migrate/029_add_test_allowed_to_problems.rb ¶ +1 -1

               class AddTestAllowedToProblems < ActiveRecord::Migration
                 def self.up
                   add_column :problems, :test_allowed, :boolean
                   Problem.reset_column_information
-            -     Problem.find(:all).each do |problem|
+            +     Problem.all.each do |problem|
                     problem.test_allowed = true
                     problem.save
                   end
                 end
                 def self.down

db/migrate/20081204122651_add_activated_to_users.rb ¶ +1 -1

               class AddActivatedToUsers < ActiveRecord::Migration
                 def self.up
                   add_column :users, :activated, :boolean, :default => 0
                   User.reset_column_information
-            -     User.find(:all).each do |user|
+            +     User.all.each do |user|
                     # disable validation
                     class <<user
                       def valid?
                         return true
                       end

db/migrate/20090416235658_add_common_ext_to_languages.rb ¶ +1 -1

                   Language.reset_column_information
                   common_ext = {
                     'c' => 'c',
                     'cpp' => 'cpp,cc',
                     'pas' => 'pas'
                   }
-            -     Language.find(:all).each do |lang|
+            +     Language.all.each do |lang|
                     lang.common_ext = common_ext[lang.name]
                     lang.save
                   end
                 end
                 def self.down

	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