cafe-grader-web Commit - r300:5e2d8fe98a1a

cafe-grader-web

Commit `r300:5e2d8fe98a1a` public

parent | child

Description:

also shows users in all (without pagination)

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r300:5e2d8fe98a1a - Sat, 03 Apr 2010 04:02:36 - 2 files changed: 15 inserted, 1 deleted

app/controllers/user_admin_controller.rb ¶ +6

               class UserAdminController < ApplicationController
                 include MailHelperMethods
                 before_filter :admin_authorization
                 def index
                   list
                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :create_from_list,
                                                     :update ],
                        :redirect_to => { :action => :list }
                 def list
                   @user_count = User.count
+            +     if params[:page] == 'all'
+            +       @users = User.all
+            +       @paginated = false
+            +     else
                     @users = User.paginate :page => params[:page]
+            +       @paginated = true
+            +     end
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end
                 def active
                   sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(params[:user])
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   lines.split("\n").each do |line|
                     items = line.chomp.split(',')
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
                       added_random_password = false
                       if items.length>=3
                         password = items[2]
                         user_alias = (items.length>=4) ? items[3] : login
                       else
                         password = random_password
                         user_alias = (items.length>=4) ? items[3] : login
                         added_random_password = true
                       end
                       user = User.new({:login => login,
                                         :full_name => full_name,
                                         :password => password,
                                         :password_confirmation => password,
                                         :alias => user_alias})
                       user.activated = true
                       user.save
                       if added_random_password
                         note << "'#{login}' (+)"
                       else
                         note << login
                       end
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully created.  ' +
                     '( (+) - created with random passwords.)'
                   redirect_to :action => 'list'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])
                   if @user.update_attributes(params[:user])
                     flash[:notice] = 'User was successfully updated.'
                     redirect_to :action => 'show', :id => @user
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   User.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def user_stat
                   @problems = Problem.find_available_problems

app/views/user_admin/list.rhtml ¶ +9 -1

               <h1>Listing users</h1>
               <div class="submitbox">
                 <b>Quick add</b>
                 <% form_tag :action => 'create' do %>
                   <table border="0">
                     <tr>
               	<td><label for="user_login">Login</label></td>
               	<td><label for="user_full_name">Full name</label></td>
               	<td><label for="user_password">Password</label></td>
               	<td><label for="user_password_confirmation">Confirm</label></td>
               	<td><label for="user_email">Email</label></td>
                     </tr>
                     <tr>
               	<td><%= text_field 'user', 'login', :size => 10  %></td>
               	<td><%= text_field 'user', 'full_name', :size => 30  %></td>
               	<td><%= password_field 'user', 'password', :size => 10  %></td>
               	<td><%= password_field 'user', 'password_confirmation', :size => 10 %></td>
               	<td><%= text_field 'user', 'email', :size => 15 %></td>
               	<td><%= submit_tag "Create" %></td>
                   </tr>
                   </table>
                 <% end %>
                 <br/>
                 <b>Import from site management</b>
                 <% form_tag({:action => 'import'}, :multipart => true) do %>
                   File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %>
                 <% end %>
                 <br/>
                 <b>What else: </b>
                 <%= link_to '[New user]', :action => 'new' %>
                 <%= link_to '[New list of users]', :action => 'new_list' %>
                 <%= link_to '[View administrators]', :action => 'admin' %>
                 <%= link_to '[Random passwords]', :action => 'random_all_passwords' %>
                 <%= link_to '[View active users]', :action => 'active' %>
                 <% if Configuration.multicontests? %>
                   <br/><b>Multi-contest:</b>
                   <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
                   View users in:
                   <% @contests.each do |contest| %>
                     <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
                   <% end %>
                   <%= link_to "[no contest]", :action => 'contests', :id => 'none' %>
                 <% end %>
               </div>
-            - Total <%= @user_count %> users | <%= will_paginate @users, :container => false %>
+            + Total <%= @user_count %> users |
+            + <% if !@paginated %>
+            +   Display all users.
+            +   <%= link_to '[show in pages]', :action => 'list', :page => '1' %>
+            + <% else %>
+            +   Display in pages.
+            +   <%= link_to '[display all]', :action => 'list', :page => 'all' %> |
+            +   <%= will_paginate @users, :container => false %>
+            + <% end %>
               <table class="info">
                 <tr class="info-head">
                   <% for column in User.content_columns %>
                     <% if !@hidden_columns.index(column.name) %>
                       <th><%= column.human_name %></th>
                     <% end %>
                   <% end %>
                   <th></th>
                   <th></th>
                   <th></th>
                 </tr>
               <% for user in @users %>
                 <tr class="info-<%= cycle("odd","even") %>">
                   <% for column in User.content_columns %>
                     <% if !@hidden_columns.index(column.name) %>
                       <td><%=h user.send(column.name) %></td>
                     <% end %>
                   <% end %>
                   <td><%= link_to 'Show', :action => 'show', :id => user %></td>
                   <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
                   <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to '[New user]', :action => 'new' %>
               <%= link_to '[New list of users]', :action => 'new_list' %>

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

r300:5e2d8fe98a1a - Sat, 03 Apr 2010 04:02:36 - 2 files changed: 15 inserted, 1 deleted

Sign in to your account

Commit r300:5e2d8fe98a1a public

Author

r300:5e2d8fe98a1a - Sat, 03 Apr 2010 04:02:36 - 2 files changed: 15 inserted, 1 deleted

Commit `r300:5e2d8fe98a1a` public