cafe-grader-web Commit - r233:ebadb70a03ab

cafe-grader-web

Commit `r233:ebadb70a03ab` public

parent | child

Description:

added admin users management

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

r233:ebadb70a03ab - Thu, 28 Jan 2010 21:50:55 - 3 files changed: 61 inserted, 0 deleted

app/views/user_admin/admin.html.haml created 644 ¶ +25

@@ -0,0 +1,25
	1	+ %h1 Administrators
	2	+
	3	+ %table
	4	+ %tr
	5	+ %th #
	6	+ %th Login
	7	+ %th Full name
	8	+ %th
	9	+ - @admins.each_with_index do \|user, i\|
	10	+ %tr
	11	+ %td= i+1
	12	+ %td= user.login
	13	+ %td= user.full_name
	14	+ %td
	15	+ - if user.login!='root'
	16	+ = link_to '[revoke]', :action => 'revoke_admin', :id => user.id
	17	+ %hr
	18	+
	19	+ - form_tag :action => 'grant_admin' do
	20	+ Grant admin permission to:
	21	+ = text_field_tag 'login'
	22	+ = submit_tag 'Grant'
	23	+
	24	+ %hr/
	25	+ = link_to '[go back to index]', :action => 'index'

app/controllers/user_admin_controller.rb ¶ +35

                 def import
                   if params[:file]==''
                     flash[:notice] = 'Error importing no file'
                     redirect_to :action => 'list' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
                   users = User.find(:all)
                   @prefix = params[:prefix] || ''
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
                   if request.request_method == :post
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                 end
+            +   # admin management
+            +
+            +   def admin
+            +     @admins = User.find(:all).find_all {|user| user.admin? }
+            +   end
+            +
+            +   def grant_admin
+            +     login = params[:login]
+            +     user = User.find_by_login(login)
+            +     if user!=nil
+            +       admin_role = Role.find_by_name('admin')
+            +       user.roles << admin_role
+            +     else
+            +       flash[:notice] = 'Unknown user'
+            +     end
+            +     flash[:notice] = 'User added as admins'
+            +     redirect_to :action => 'admin'
+            +   end
+            +
+            +   def revoke_admin
+            +     user = User.find(params[:id])
+            +     if user==nil
+            +       flash[:notice] = 'Unknown user'
+            +       redirect_to :action => 'admin' and return
+            +     elsif user.login == 'root'
+            +       flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
+            +       redirect_to :action => 'admin' and return
+            +     end
+            +
+            +     admin_role = Role.find_by_name('admin')
+            +     user.roles.delete(admin_role)
+            +     flash[:notice] = 'User permission revoked'
+            +     redirect_to :action => 'admin'
+            +   end
+            +
                 protected
                 def random_password(length=5)
                   chars = 'abcdefghijkmnopqrstuvwxyz23456789'
                   newpass = ""
                   length.times { newpass << chars[rand(chars.size-1)] }
                   return newpass
                 end
                 def import_from_file(f)
                   data_hash = YAML.load(f)
                   @import_log = ""
                   country_data = data_hash[:countries]
                   site_data = data_hash[:sites]
                   user_data = data_hash[:users]
                   # import country
                   countries = {}
                   country_data.each_pair do |id,country|
                     c = Country.find_by_name(country[:name])
                     if c!=nil
                       countries[id] = c
                       @import_log << "Found #{country[:name]}\n"

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

                 <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' %>
               </div>
               <table>
                 <tr>
                 <% for column in User.content_columns %>
                   <% if !@hidden_columns.index(column.name) %>
                     <th><%= column.human_name %></th>
                   <% end %>
                 <% end %>
                 </tr>
               <% for user in @users %>
                 <tr>
                 <% 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>

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

r233:ebadb70a03ab - Thu, 28 Jan 2010 21:50:55 - 3 files changed: 61 inserted, 0 deleted

Sign in to your account

Commit r233:ebadb70a03ab public

Author

r233:ebadb70a03ab - Thu, 28 Jan 2010 21:50:55 - 3 files changed: 61 inserted, 0 deleted

Commit `r233:ebadb70a03ab` public