Merge branch 'chef-840' of git://github.com/btm/chef into btm/chef-840

Author: adamhjk

chef-server-webui/app/controllers/clients.rb

@@ -80,7 +80,7 @@ def update
         @client.create_keys
         @private_key = @client.private_key
       end 
-      @client.admin(str_to_bool(params[:admin])) unless params[:admin].nil?
+      params[:admin] ? @client.admin(true) : @client.admin(false)
       @client.save
       @_message = @private_key.nil? ? { :notice => "Updated Client" } : { :notice => "Created Client #{@client.name}. Please copy the following private key as the client's validation key." }
       render :show

chef-server-webui/app/views/clients/_form.html.haml

@@ -14,9 +14,8 @@
 
     %div.group.form
       %label.label Admin
-      = text_field :id => "client_admin", :name => "admin", :class => "text_field", :value => @client.admin
-      %span.description Whether or not the Client is an admin
-      
+      = check_box :id => "client_admin", :name => "admin", :value => "true", :label => "Whether or not the Client is an admin", :checked => @client.admin
+
     = form(:action => form_url, :method => :post, :id => form_id, :class => 'form') do
       %div.group
         .actions-bar