cafe-grader-web Commit - r639:2826fdf23cce

cafe-grader-web

Commit `r639:2826fdf23cce` public

parent | child

Description:

fix user update

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r639:2826fdf23cce - Thu, 02 Feb 2017 02:17:29 - 2 files changed: 4 inserted, 4 deleted

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

                     flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
                     redirect_to :action => 'admin' and return
                   end
                   admin_role = Role.find_by_name('admin')
                   user.roles.delete(admin_role)
                   flash[:notice] = 'User permission revoked'
                   redirect_to :action => 'admin'
                 end
                 # mass mailing
                 def mass_mailing
                 end
                 def bulk_mail
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_subject = params[:subject]
                   if !mail_subject or mail_subject.blank?
                     flash[:notice] = 'You entered an empty mail subject.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_body = params[:email_body]
                   if !mail_body or mail_body.blank?
                     flash[:notice] = 'You entered an empty mail body.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   note = []
                   users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
                       send_mail(user.email, mail_subject, mail_body)
                       note << user.login
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'mass_mailing'
                 end
                 protected
                 def random_password(length=5)
                   chars = 'abcdefghijkmnopqrstuvwxyz23456789'
                   newpass = ""
                   length.times { newpass << chars[rand(chars.size-1)] }
                   return newpass
                 end
                 def import_from_file(f)
                   data_hash = YAML.load(f)
                   @import_log = ""
                   country_data = data_hash[:countries]
                   site_data = data_hash[:sites]
                   user_data = data_hash[:users]
                   # import country
                   countries = {}
                   country_data.each_pair do |id,country|
                     c = Country.find_by_name(country[:name])
                     if c!=nil
                       countries[id] = c
                       @import_log << "Found #{country[:name]}\n"
                     else
                       countries[id] = Country.new(:name => country[:name])
                       countries[id].save
                       @import_log << "Created #{country[:name]}\n"
                     end
                   end
                   # import sites
                   sites = {}
                   site_data.each_pair do |id,site|
                     s = Site.find_by_name(site[:name])
                     if s!=nil
                       @import_log << "Found #{site[:name]}\n"
                     else
                       s = Site.new(:name => site[:name])
                       @import_log << "Created #{site[:name]}\n"
                     end
                     s.password = site[:password]
                     s.country = countries[site[:country_id]]
                     s.save
                     sites[id] = s
                   end
                   # import users
                   user_data.each_pair do |id,user|
                     u = User.find_by_login(user[:login])
                     if u!=nil
                       @import_log << "Found #{user[:login]}\n"
                     else
                       u = User.new(:login => user[:login])
                       @import_log << "Created #{user[:login]}\n"
                     end
                     u.full_name = user[:name]
                     u.password = user[:password]
                     u.country = countries[user[:country_id]]
                     u.site = sites[user[:site_id]]
                     u.activated = true
                     u.email = "empty-#{u.login}@none.com"
                     if not u.save
                       @import_log << "Errors\n"
                       u.errors.each { |attr,msg|  @import_log << "#{attr} - #{msg}\n" }
                     end
                   end
                 end
                 def logout_users(users)
                   users.each do |user|
                     contest_stat = user.contest_stat(true)
                     if contest_stat and !contest_stat.forced_logout
                       contest_stat.forced_logout = true
                       contest_stat.save
                     end
                   end
                 end
                 def send_contest_update_notification_email(user, contest)
                   contest_title_name = GraderConfiguration['contest.name']
                   contest_name = contest.name
                   mail_subject = t('contest.notification.email_subject', {
                                      :contest_title_name => contest_title_name,
                                      :contest_name => contest_name })
                   mail_body = t('contest.notification.email_body', {
                                   :full_name => user.full_name,
                                   :contest_title_name => contest_title_name,
                                   :contest_name => contest.name,
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 def find_contest_and_user_from_contest_id(id)
                   if id!='none'
                     @contest = Contest.find(id)
                   else
                     @contest = nil
                   end
                   if @contest
                     @users = @contest.users
                   else
                     @users = User.find_users_with_no_contest
                   end
                   return [@contest, @users]
                 end
                 def gen_csv_from_scorearray(scorearray,problem)
                   CSV.generate do |csv|
                     #add header
                     header = ['User','Name', 'Activated?', 'Logged in', 'Contest']
                     problem.each { |p| header << p.name }
                     header += ['Total','Passed']
                     csv << header
                     #add data
                     scorearray.each do |sc|
                       total = num_passed = 0
                       row = Array.new
                       sc.each_index do |i|
                         if i == 0
                           row << sc[i].login
                           row << sc[i].full_name
                           row << sc[i].activated
                           row << (sc[i].try(:contest_stat).try(:started_at).nil? ? 'no' : 'yes')
                           row << sc[i].contests.collect {|c| c.name}.join(', ')
                         else
                           row << sc[i][0]
                           total += sc[i][0]
                           num_passed += 1 if sc[i][1]
                         end
                       end
                       row << total
                       row << num_passed
                       csv << row
                     end
                   end
                 end
                 private
                   def user_params
-            -       params.require(:user).permit(:login,:full_name,:hashed_password,:salt,:alias,:email,:site_id,:country_id,:activated,:enabled,:remark,:last_ip,:section)
+            +       params.require(:user).permit(:login,:password,:password_confirmation,:email, :alias, :full_name,:remark)
                   end
               end

test/controllers/announcements_controller_test.rb ¶ +3 -3

               require 'test_helper'
               class AnnouncementsControllerTest < ActionController::TestCase
                 setup do
                   @announcement = announcements(:one)
-            -     @request.session[:user_id] = users(:admin).id
+            +     @request.session[:user_id] = user(:admin).id
                 end
                 test "should get index" do
                   get :index
                   assert_response :success
                   assert_not_nil assigns(:announcements)
                 end
                 test "should get new" do
                   get :new
                   assert_response :success
                 end
                 test "should create announcement" do
                   assert_difference('Announcement.count') do
-            -       post :create, announcement: {  author: 'test', body: 'haha', published: true}
+            +       post :create, announcement: {  }
                   end
                   assert_redirected_to announcement_path(assigns(:announcement))
                 end
                 test "should show announcement" do
                   get :show, id: @announcement
                   assert_response :success
                 end
                 test "should get edit" do
                   get :edit, id: @announcement
                   assert_response :success
                 end
                 test "should update announcement" do
-            -     patch :update, id: @announcement, announcement: { body: 'another body' }
+            +     patch :update, id: @announcement, announcement: {  }
                   assert_redirected_to announcement_path(assigns(:announcement))
                 end
                 test "should destroy announcement" do
                   assert_difference('Announcement.count', -1) do
                     delete :destroy, id: @announcement
                   end
                   assert_redirected_to announcements_path
                 end
               end

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

r639:2826fdf23cce - Thu, 02 Feb 2017 02:17:29 - 2 files changed: 4 inserted, 4 deleted

Sign in to your account

Commit r639:2826fdf23cce public

Author

r639:2826fdf23cce - Thu, 02 Feb 2017 02:17:29 - 2 files changed: 4 inserted, 4 deleted

Commit `r639:2826fdf23cce` public