cafe-grader-web Commit - r571:f8d309d2e37e

cafe-grader-web

Commit `r571:f8d309d2e37e` public

parent | child

Description:

- bootstrap: user admin quick add

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r571:f8d309d2e37e - Mon, 11 Jul 2016 07:50:39 - 2 files changed: 30 inserted, 29 deleted

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

                 def create
                   @user = User.new(params[:user])
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
-            -       redirect_to :action => 'list'
+            +       redirect_to :action => 'index'
                   else
                     render :action => 'new'
                   end
                 end
                 def clear_last_ip
                   @user = User.find(params[:id])
                   @user.last_ip = nil
                   @user.save
-            -     redirect_to action: 'list', page: params[:page]
+            +     redirect_to action: 'index', page: params[:page]
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                       end
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully created.  ' +
                     '( (+) - created with random passwords.)'
-            -     redirect_to :action => 'list'
+            +     redirect_to :action => 'index'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   User.find(params[:id]).destroy
-            -     redirect_to :action => 'list'
+            +     redirect_to :action => 'index'
                 end
                 def user_stat
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                   end
                 end
                 def import
                   if params[:file]==''
                     flash[:notice] = 'Error importing no file'
-            -       redirect_to :action => 'list' and return
+            +       redirect_to :action => 'index' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
                   users = User.find(:all)
                 def add_to_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests << contest
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to :action => 'index'
                 end
                 def remove_from_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests.delete(contest)
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to :action => 'index'
                 end
                 def contest_management
                 end
                 def manage_contest

app/views/user_admin/index.html.haml ¶ +23 -22

@@ -1,30 +1,31
1	%h1 Listing users	1	%h1 Listing users
		2	+
		3	+ .panel.panel-primary
		4	+ .panel-title.panel-heading
		5	+ Quick Add
		6	+ .panel-body
		7	+ = form_tag( {method: 'post'}, {class: 'form-inline'}) do
		8	+ .form-group
		9	+ = label_tag 'user_login', 'Login'
		10	+ = text_field 'user', 'login', :size => 10,class: 'form-control'
		11	+ .form-group
		12	+ = label_tag 'user_full_name', 'Full Name'
		13	+ = text_field 'user', 'full_name', :size => 10,class: 'form-control'
		14	+ .form-group
		15	+ = label_tag 'user_password', 'Password'
		16	+ = text_field 'user', 'password', :size => 10,class: 'form-control'
		17	+ .form-group
		18	+ = label_tag 'user_password_confirmation', 'Confirm'
		19	+ = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
		20	+ .form-group
		21	+ = label_tag 'user_email', 'email'
		22	+ = text_field 'user', 'email', :size => 10,class: 'form-control'
		23	+ =submit_tag "Create", class: 'btn btn-primary'
		24	+
2	.submitbox	25	.submitbox
3	- %b Quick add
4	- = form_tag :action => 'create' do
5	- %table{:border => "0"}
6	- %tr
7	- %td
8	- %label{:for => "user_login"} Login
9	- %td
10	- %label{:for => "user_full_name"} Full name
11	- %td
12	- %label{:for => "user_password"} Password
13	- %td
14	- %label{:for => "user_password_confirmation"} Confirm
15	- %td
16	- %label{:for => "user_email"} Email
17	- %tr
18	- %td= text_field 'user', 'login', :size => 10
19	- %td= text_field 'user', 'full_name', :size => 30
20	- %td= password_field 'user', 'password', :size => 10
21	- %td= password_field 'user', 'password_confirmation', :size => 10
22	- %td= email_field 'user', 'email', :size => 15
23	- %td= submit_tag "Create"
24	- %br/
25	%b Import from site management	26	%b Import from site management
26	= form_tag({:action => 'import'}, :multipart => true) do	27	= form_tag({:action => 'import'}, :multipart => true) do
27	File: #{file_field_tag 'file'} #{submit_tag 'Import'}	28	File: #{file_field_tag 'file'} #{submit_tag 'Import'}
28	%br/	29	%br/
29	%b What else:	30	%b What else:
30	= link_to 'New user', {:action => 'new'}, { class: 'btn btn-default btn-sm'}	31	= link_to 'New user', {:action => 'new'}, { class: 'btn btn-default btn-sm'}

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

r571:f8d309d2e37e - Mon, 11 Jul 2016 07:50:39 - 2 files changed: 30 inserted, 29 deleted

Sign in to your account

Commit r571:f8d309d2e37e public

Author

r571:f8d309d2e37e - Mon, 11 Jul 2016 07:50:39 - 2 files changed: 30 inserted, 29 deleted

Commit `r571:f8d309d2e37e` public