cafe-grader-web Commit - r1:82d71b81c3b0

cafe-grader-web

Commit `r1:82d71b81c3b0` public

parent | child

Description:

moved to ror 2.0.2, add user rel to model submission git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@3 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r1:82d71b81c3b0 - Sat, 12 Jan 2008 01:38:39 - 7 files changed: 5 inserted, 10 deleted

app/controllers/problems_controller.rb ¶ +1 -3

               class ProblemsController < ApplicationController
                 before_filter :authenticate, :authorization
                 def index
                   list
                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy, :create, :update ],
                        :redirect_to => { :action => :list }
                 def list
-            -     @problem_pages, @problems = paginate(:problems,
+            +     @problems = Problem.find(:all, :order => 'date_added DESC')
-            -                                          :per_page => 10,
-            -                                          :order => 'date_added DESC')
                 end
                 def show
                   @problem = Problem.find(params[:id])
                 end
                 def new
                   @problem = Problem.new
                 end
                 def create
                   @problem = Problem.new(params[:problem])
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def edit
                   @problem = Problem.find(params[:id])
                 end

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

               class UserAdminController < ApplicationController
                 before_filter :authenticate, :authorization
                 def index
                   list
                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy, :create, :update ],
                        :redirect_to => { :action => :list }
                 def list
-            -     @user_pages, @users = paginate :users, :per_page => 50
+            +     @users = User.find(:all)
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(params[:user])
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def edit
                   @user = User.find(params[:id])
                 end

app/models/submission.rb ¶ +1

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
+            +   belongs_to :user
                 def self.find_by_user_and_problem(user_id, problem_id)
                   subcount = count(:conditions => "user_id = #{user_id} AND problem_id = #{problem_id}")
                   if subcount != 0
                     last_sub = find(:first,
               		      :conditions => {:user_id => user_id,
               			:problem_id => problem_id},
               		      :order => 'submitted_at DESC')
                   else
                     last_sub = nil
                   end
                   return subcount, last_sub
                 end
                 def self.find_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id)")
                 end

app/views/problems/list.rhtml ¶ -2

               <%= link_to 'Main', :controller => 'main', :action => 'list' %>
               </div>
               <table>
                 <tr>
                 <% for column in Problem.content_columns %>
                   <th><%= column.human_name %></th>
                 <% end %>
                 </tr>
               <% for problem in @problems %>
                 <tr>
                 <% for column in Problem.content_columns %>
                   <td><%=h problem.send(column.name) %></td>
                 <% end %>
                   <td><%= link_to '[Toggle]', :action => 'toggle_avail', :id => problem.id %></td>
                   <td><%= link_to '[Stat]', :action => 'stat', :id => problem.id %></td>
                   <td><%= link_to '[Show]', :action => 'show', :id => problem %></td>
                   <td><%= link_to '[Edit]', :action => 'edit', :id => problem %></td>
                   <td><%= link_to '[Destroy]', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
-            - <%= link_to 'Previous page', { :page => @problem_pages.current.previous } if @problem_pages.current.previous %>
-            - <%= link_to 'Next page', { :page => @problem_pages.current.next } if @problem_pages.current.next %>
               <br />
               <%= link_to 'New problem', :action => 'new' %>

app/views/user_admin/list.rhtml ¶ -2

               </tr></table>
               <% end %>
               </div>
               <table>
                 <tr>
                 <% for column in User.content_columns %>
                   <th><%= column.human_name %></th>
                 <% end %>
                 </tr>
               <% for user in @users %>
                 <tr>
                 <% for column in User.content_columns %>
                   <td><%=h user.send(column.name) %></td>
                 <% end %>
                   <td><%= link_to 'Show', :action => 'show', :id => user %></td>
                   <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
                   <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
-            - <%= link_to 'Previous page', { :page => @user_pages.current.previous } if @user_pages.current.previous %>
-            - <%= link_to 'Next page', { :page => @user_pages.current.next } if @user_pages.current.next %>
               <br />
               <%= link_to 'New user', :action => 'new' %>

config/environment.rb ¶ +1 -1

               # Be sure to restart your web server when you modify this file.
               # Uncomment below to force Rails into production mode when
               # you don't control web/app server and can't set it the proper way
               # ENV['RAILS_ENV'] ||= 'production'
               # Specifies gem version of Rails to use when vendor/rails is not present
-            - RAILS_GEM_VERSION = '1.2.4' unless defined? RAILS_GEM_VERSION
+            + RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
               # Bootstrap the Rails environment, frameworks, and default configuration
               require File.join(File.dirname(__FILE__), 'boot')
               Rails::Initializer.run do |config|
                 # Settings in config/environments/* take precedence over those specified here
                 # Skip frameworks you're not going to use (only works if using vendor/rails)
                 # config.frameworks -= [ :action_web_service, :action_mailer ]
                 # Only load the plugins named here, by default all plugins in vendor/plugins are loaded
                 # config.plugins = %W( exception_notification ssl_requirement )
                 # Add additional load paths for your own custom dirs
                 # config.load_paths += %W( #{RAILS_ROOT}/extras )
                 # Force all environments to use the same logger level
                 # (by default production uses :info, the others :debug)
                 # config.log_level = :debug
                 # Use the database for sessions instead of the file system
                 # (create the session table with 'rake db:sessions:create')
                 config.action_controller.session_store = :active_record_store

config/environments/development.rb ¶ +1 -1

               # Settings specified here will take precedence over those in config/environment.rb
               # In the development environment your application's code is reloaded on
               # every request.  This slows down response time but is perfect for development
               # since you don't have to restart the webserver when you make code changes.
               config.cache_classes = false
               # Log error messages when you accidentally call methods on nil.
               config.whiny_nils = true
               # Enable the breakpoint server that script/breakpointer connects to
-            - config.breakpoint_server = true
+            + #config.breakpoint_server = true
               # Show full error reports and disable caching
               config.action_controller.consider_all_requests_local = true
               config.action_controller.perform_caching             = false
               config.action_view.cache_template_extensions         = false
               config.action_view.debug_rjs                         = true
               # Don't care if the mailer can't send
               config.action_mailer.raise_delivery_errors = false

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

r1:82d71b81c3b0 - Sat, 12 Jan 2008 01:38:39 - 7 files changed: 5 inserted, 10 deleted

Sign in to your account

Commit r1:82d71b81c3b0 public

Author

r1:82d71b81c3b0 - Sat, 12 Jan 2008 01:38:39 - 7 files changed: 5 inserted, 10 deleted

Commit `r1:82d71b81c3b0` public