cafe-grader-web Commit - r759:6c24fe0db627

cafe-grader-web

Commit `r759:6c24fe0db627` public

parent | child

Description:

fix user profile, add test

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r759:6c24fe0db627 - Fri, 04 Oct 2019 12:13:26 - 7 files changed: 76 inserted, 55 deleted

app/controllers/users_controller.rb ¶ +12 -5

                                                          :retrieve_password]
                 before_action :verify_online_registration, :only => [:new,
                                                                      :register,
                                                                      :forget,
                                                                      :retrieve_password]
-            -   before_action :check_valid_login, :profile_authorization, only: [:profile]
                 before_action :admin_authorization, only: [:stat, :toggle_activate, :toggle_enable]
                 #in_place_edit_for :user, :alias_for_editing
                 #in_place_edit_for :user, :email_for_editing
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @user = User.find(session[:user_id])
                   end
                 end
+            +   # edit logged in user profile
+            +   def profile
+            +     if !GraderConfiguration['system.user_setting_enabled']
+            +       redirect_to :controller => 'main', :action => 'list'
+            +     else
+            +       @user = current_user;
+            +     end
+            +   end
+            +
                 def chg_passwd
                   user = User.find(session[:user_id])
-            -     user.password = params[:passwd]
+            +     user.password = params[:password]
-            -     user.password_confirmation = params[:passwd_verify]
+            +     user.password_confirmation = params[:password_confirmation]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
-            -     redirect_to :action => 'index'
+            +     redirect_to :action => 'profile'
                 end
                 def new
                   @user = User.new
                   render :action => 'new', :layout => 'empty'
                 end
                 end
                 private
                   def user_params
                     params.require(:user).permit(:login, :full_name, :email)
                   end
               end

app/views/layouts/_header.html.haml ¶ +1 -1

                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
-            -             = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
+            +             = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog', id: 'user_profile')}".html_safe, 'users', 'profile', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
               /
                 - if (@current_user!=nil) and (session[:admin])
                   %nav.navbar.navbar-fixed-top.navbar-inverse.secondnavbar
                     .container-fluid

app/views/user_admin/_form.html.haml ¶ +9 -11

@@ -1,14 +1,12
1	= simple_form_for(@user) do \|f\|	1	= simple_form_for(@user) do \|f\|
2	= f.error_notification	2	= f.error_notification
3	- .row	3	+ = f.input :login, label: 'Login'
4	- .col-md-6.col-md-offset-2	4	+ = f.input :full_name, label: 'Full name'
5	- = f.input :login, label: 'Login'	5	+ = f.input :password
6	- = f.input :full_name, label: 'Full name'	6	+ = f.input :password_confirmation
7	- = f.input :~~password~~	7	+ = f.input :email
8	- = f.input :password_confirmation	8	+ = f.input :alias
9	- = f.input :~~email~~	9	+ = f.input :remark
10	- = f.input :alias	10	+ = f.button :submit, class: 'btn btn-primary'
11	- = f.input :remark	11	+ = link_to 'Cancel', :back, class: 'btn btn-default'
12	- = f.button :submit, class: 'btn btn-success'
13	- = link_to 'Cancel', :back, class: 'btn btn-default'
14		12

app/views/user_admin/edit.html.haml ¶ +8 -3

@@ -1,4 +1,9
1	- %h1 Editing user	1	+ .container-fluid
2	- = simple_form_for @user, url: user_admin_path(@user) do \|f\|	2	+ .row
3	- = render partial: 'form', local: f	3	+ .col-md-6
		4	+ %h1 Editing user
		5	+ .row
		6	+ .col-md-6
		7	+ = simple_form_for @user, url: user_admin_path(@user) do \|f\|
		8	+ = render partial: 'form', local: f
4		9

app/views/users/profile.html.haml ⬅ ~~app/views/users/index.html.haml~~ renamed ¶ +23 -35

@@ -1,36 +1,24
1	- = user_title_bar(@user)
2	-
3	- %h1 Your account settings
4	-
5	- -#%p
6	- -#You can edit your alias and e-mails. Just click on the text and edit it.
7		1
8	- %table.table.table-bordered{:style => "width:30%"}	2	+ .container-fluid
9	- %tr	3	+ = form_tag :action => 'chg_passwd', :method => 'post' do
10	- %th Login	4	+ .row
11	- %td= @user.login	5	+ .col-md-6
12	- %tr	6	+ %h1 Your account settings
13	- %th Full name	7	+ .form-group
14	- %td= @user.full_name	8	+ %label{:for => "login"} Login
15	- -#%tr	9	+ =@user.login
16	- -#%th.uinfo Alias	10	+ .form-group
17	- -#%td.uinfo= in_place_editor_field :user, 'alias_for_editing', {}, :rows => 1	11	+ %label{:for => "full_name"} Full name
18	- -#%tr	12	+ =@user.full_name
19	- -#%th.uinfo E-mail	13	+ .form-group
20	- -#%td.uinfo= in_place_editor_field :user, 'email_for_editing', {}, :rows => 1	14	+ %label{:for => "password"} Password
21	- %tr	15	+ =password_field_tag :password, nil, class: 'form-control'
22	- %th Password	16	+ .form-group
23	- %td	17	+ %label{:for => "password_confirmation"} Password confirmation
24	- = form_tag :action => 'chg_passwd', :method => 'post' do	18	+ =password_field_tag :password_confirmation, nil, class: 'form-control'
25	- %table	19	+ .row
26	- %tr	20	+ .col-md-6
27	- %td	21	+ =submit_tag 'Edit', class: 'btn btn-primary'
28	- %input{:type => "password", :class => "form-control", :name => "passwd", :id => "passwd"}	22	+
29	- %td (new)	23	+
30	- %tr	24	+
31	- %td
32	- %input{:type => "password", :class => "form-control", :name => "passwd_verify", :id => "passwd_verify"}
33	- %td (verify)
34	- %tr
35	- %td{:colspan => "2"}
36	- %input{:type => "button", :class => "btn btn-default", :name => "commit", :value => "Change Password"}

config/routes.rb ¶ +4

                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
+            +     collection do
+            +       get 'profile'
+            +       post 'chg_passwd'
+            +     end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'

test/system/users_test.rb ¶ +19

@@ -90,12 +90,31
90	login 'james','morning'	90	login 'james','morning'
91	visit new_list_user_admin_index_path	91	visit new_list_user_admin_index_path
92	assert_text 'You are not authorized'	92	assert_text 'You are not authorized'
93	assert_current_path login_main_path	93	assert_current_path login_main_path
94	end	94	end
95		95
		96	+ test "login then change password" do
		97	+ newpassword = '1234asdf'
		98	+ login 'john', 'hello'
		99	+ visit profile_users_path
		100	+
		101	+ fill_in 'password', with: newpassword
		102	+ fill_in 'password_confirmation', with: newpassword
		103	+
		104	+ click_on 'Edit'
		105	+
		106	+ visit logout_main_path
		107	+ login 'john', 'hello'
		108	+ assert_text 'Wrong password'
		109	+
		110	+ login 'john', newpassword
		111	+ assert_text "MAIN"
		112	+ assert_text "Submission"
		113	+ end
		114	+
96	def login(username,password)	115	def login(username,password)
97	visit root_path	116	visit root_path
98	fill_in "Login", with: username	117	fill_in "Login", with: username
99	fill_in "Password", with: password	118	fill_in "Password", with: password
100	click_on "Login"	119	click_on "Login"
101	end	120	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

r759:6c24fe0db627 - Fri, 04 Oct 2019 12:13:26 - 7 files changed: 76 inserted, 55 deleted

Sign in to your account

Commit r759:6c24fe0db627 public

Author

r759:6c24fe0db627 - Fri, 04 Oct 2019 12:13:26 - 7 files changed: 76 inserted, 55 deleted

Commit `r759:6c24fe0db627` public