cafe-grader-web

Commit r639:2826fdf23cce public

parent | child
Description:
fix user update
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r639:2826fdf23cce - - 2 files changed: 4 inserted, 4 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -505,51 +505,51
505 505
506 506 def find_contest_and_user_from_contest_id(id)
507 507 if id!='none'
508 508 @contest = Contest.find(id)
509 509 else
510 510 @contest = nil
511 511 end
512 512 if @contest
513 513 @users = @contest.users
514 514 else
515 515 @users = User.find_users_with_no_contest
516 516 end
517 517 return [@contest, @users]
518 518 end
519 519
520 520 def gen_csv_from_scorearray(scorearray,problem)
521 521 CSV.generate do |csv|
522 522 #add header
523 523 header = ['User','Name', 'Activated?', 'Logged in', 'Contest']
524 524 problem.each { |p| header << p.name }
525 525 header += ['Total','Passed']
526 526 csv << header
527 527 #add data
528 528 scorearray.each do |sc|
529 529 total = num_passed = 0
530 530 row = Array.new
531 531 sc.each_index do |i|
532 532 if i == 0
533 533 row << sc[i].login
534 534 row << sc[i].full_name
535 535 row << sc[i].activated
536 536 row << (sc[i].try(:contest_stat).try(:started_at).nil? ? 'no' : 'yes')
537 537 row << sc[i].contests.collect {|c| c.name}.join(', ')
538 538 else
539 539 row << sc[i][0]
540 540 total += sc[i][0]
541 541 num_passed += 1 if sc[i][1]
542 542 end
543 543 end
544 544 row << total
545 545 row << num_passed
546 546 csv << row
547 547 end
548 548 end
549 549 end
550 550
551 551 private
552 552 def user_params
553 - params.require(:user).permit(:login,:full_name,:hashed_password,:salt,:alias,:email,:site_id,:country_id,:activated,:enabled,:remark,:last_ip,:section)
553 + params.require(:user).permit(:login,:password,:password_confirmation,:email, :alias, :full_name,:remark)
554 554 end
555 555 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,50 +1,50
1 1 require 'test_helper'
2 2
3 3 class AnnouncementsControllerTest < ActionController::TestCase
4 4 setup do
5 5 @announcement = announcements(:one)
6 - @request.session[:user_id] = users(:admin).id
6 + @request.session[:user_id] = user(:admin).id
7 7 end
8 8
9 9 test "should get index" do
10 10 get :index
11 11 assert_response :success
12 12 assert_not_nil assigns(:announcements)
13 13 end
14 14
15 15 test "should get new" do
16 16 get :new
17 17 assert_response :success
18 18 end
19 19
20 20 test "should create announcement" do
21 21 assert_difference('Announcement.count') do
22 - post :create, announcement: { author: 'test', body: 'haha', published: true}
22 + post :create, announcement: { }
23 23 end
24 24
25 25 assert_redirected_to announcement_path(assigns(:announcement))
26 26 end
27 27
28 28 test "should show announcement" do
29 29 get :show, id: @announcement
30 30 assert_response :success
31 31 end
32 32
33 33 test "should get edit" do
34 34 get :edit, id: @announcement
35 35 assert_response :success
36 36 end
37 37
38 38 test "should update announcement" do
39 - patch :update, id: @announcement, announcement: { body: 'another body' }
39 + patch :update, id: @announcement, announcement: { }
40 40 assert_redirected_to announcement_path(assigns(:announcement))
41 41 end
42 42
43 43 test "should destroy announcement" do
44 44 assert_difference('Announcement.count', -1) do
45 45 delete :destroy, id: @announcement
46 46 end
47 47
48 48 assert_redirected_to announcements_path
49 49 end
50 50 end
You need to be logged in to leave comments. Login now