cafe-grader-web Commit - r308:c400f7405eee

cafe-grader-web

parent | child

Description:

added default contest

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

r308:c400f7405eee - Mon, 10 May 2010 16:47:12 - 3 files changed: 23 inserted, 1 deleted

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

                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
-            -     end
+            +     end
                 end
                 def create_from_list

app/models/user.rb ¶ +14

                 before_save :encrypt_new_password
                 before_save :assign_default_site
+            +   before_save :assign_default_contest
                 # this is for will_paginate
                 cattr_reader :per_page
                     end
                   end
+            +     def assign_default_contest
+            +       # have to catch error when migrating (because self.site is not available).
+            +       begin
+            +         if self.contests.length == 0
+            +           default_contest = Contest.find_by_name(Configuration['contest.default_contest_name'])
+            +           if default_contest
+            +             self.contests = [default_contest]
+            +           end
+            +         end
+            +       rescue
+            +       end
+            +     end
+            +
                   def password_required?
                     self.hashed_password.blank? || !self.password.blank?
                   end

db/seeds.rb ¶ +8

                    :key => 'contest.confirm_indv_contest_start',
                    :value_type => 'boolean',
                    :default_value => 'false'
+            +    },
+            +
+            +    {
+            +      :key => 'contest.default_contest_name',
+            +      :value_type => 'string',
+            +      :default_value => 'none',
+            +      :description => "New user will be assigned to this contest automatically, if it exists.  Set to 'none' if there is no default contest."
                  }
+            +
                 ]

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