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: 64 inserted, 43 deleted

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

                                                                      :register,
                                                                      :forget,
                                                                      :retrieve_password]
-            -   before_action :check_valid_login, :profile_authorization, only: [:profile]
                 before_action :admin_authorization, only: [:stat, :toggle_activate, :toggle_enable]
                   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
                   def user_params
                     params.require(:user).permit(:login, :full_name, :email)
                   end
               end

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

                         = 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'}})
               /

app/views/user_admin/_form.html.haml ¶ +1 -3

               = simple_form_for(@user) do |f|
                 = f.error_notification
-            -   .row
-            -     .col-md-6.col-md-offset-2
                 = f.input :login, label: 'Login'
                 = f.input :full_name, label: 'Full name'
                 = f.input :password
                 = f.input :email
                 = f.input :alias
                 = f.input :remark
-            -       = f.button :submit, class: 'btn btn-success'
+            +   = f.button :submit, class: 'btn btn-primary'
                 = link_to 'Cancel', :back, class: 'btn btn-default'

app/views/user_admin/edit.html.haml ¶ +5

+            + .container-fluid
+            +   .row
+            +     .col-md-6
                     %h1 Editing user
+            +   .row
+            +     .col-md-6
                     = simple_form_for @user, url: user_admin_path(@user) do |f|
                       = render partial: 'form', local: f

app/views/users/profile.html.haml ⬅ ~~app/views/users/index.html.haml~~ renamed ¶ +22 -34

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

config/routes.rb ¶ +4

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

test/system/users_test.rb ¶ +19

@@ -93,6 +93,25
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

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: 64 inserted, 43 deleted

Sign in to your account

Commit r759:6c24fe0db627 public

Author

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

Commit `r759:6c24fe0db627` public