X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fpersons%2Fperson.php;h=ea948f95f54c87dc045ccf8dce54fe3ed751b5fd;hb=1ce86fd37ce8da9b475847a59394c0241a8dbbff;hp=dac802843bf3c3e83f710f13162ade9a1640885f;hpb=cc980b8224b32832478303f446ba1200203a410e;p=plewww.git diff --git a/planetlab/persons/person.php b/planetlab/persons/person.php index dac8028..ea948f9 100644 --- a/planetlab/persons/person.php +++ b/planetlab/persons/person.php @@ -1,7 +1,5 @@ 'POST', 'url'=>l_actions(), 'values'=>array('action'=>'become-person', 'person_id'=>$person_id), 'bubble'=>"Become $first_name $last_name", - 'confirm'=>"Are you sure you want to su $first_name $last_name"); + 'confirm'=>"Are you sure you want to become $first_name $last_name"); -if ($local_peer && $privileges) +if ($local_peer && $privileges && ! $is_my_account) if ($enabled) $tabs['Disable'] = array ('method'=>'POST', 'url'=>l_actions(), @@ -101,7 +101,7 @@ if ($local_peer && $privileges) 'confirm'=>"Are you sure you want to enable $first_name $last_name"); // delete -if ($local_peer && $privileges && $local_peer) +if ($local_peer && $privileges && $local_peer && ! $is_my_account) $tabs['Delete'] = array ('method'=>'POST', 'url'=>l_actions(), 'values'=> array ('person_id'=>$person_id, @@ -129,7 +129,7 @@ $can_update = (plc_is_admin() && $local_peer) || $is_my_account; $toggle = new PlekitToggle ('person',"Details", array('bubble'=>'Display and modify details for that account', - 'visible'=>get_arg('show_details',true))); + 'visible'=>get_arg('show_details'))); $toggle->start(); $details = new PlekitDetails($can_update); @@ -139,10 +139,10 @@ $details->form_start(l_actions(),array("action"=>"update-person", $details->start(); -$details->th_td("Title",$title,"title",array('width'=>5)); +$details->th_td("Title",$title,"title",array('width'=>10)); $details->th_td("First Name",$first_name,"first_name"); $details->th_td("Last Name",$last_name,"last_name"); -$details->th_td(href("mailto:$email","Email"),$email,"email"); +$details->th_td(href("mailto:$email","Email"),$email,"email",array("width"=>30)); $details->th_td("Phone",$phone,"phone"); $details->th_td("URL",$url,"url",array('width'=>40)); $details->th_td("Bio",$bio,"bio",array('input_type'=>'textarea','height'=>4)); @@ -169,7 +169,7 @@ $toggle->end(); if ($local_peer) { $slices_title=count_english_warning($slices,'slice'); $toggle=new PlekitToggle ('slices',$slices_title, - array('visible'=>get_arg('show_slices',false))); + array('visible'=>get_arg('show_slices'))); $toggle->start(); if( ! $slices) { @@ -205,7 +205,7 @@ $form->start(); //////////////////// keys if ($local_peer) { $keys_title = count_english_warning($keys,'key'); - $toggle=new PlekitToggle ('keys',$keys_title,array('visible'=>get_arg('show_keys',false))); + $toggle=new PlekitToggle ('keys',$keys_title,array('visible'=>get_arg('show_keys'))); $toggle->start(); $can_manage_keys = ( $local_peer && ( plc_is_admin() || $is_my_account) ); @@ -257,7 +257,7 @@ if ($local_peer) { if ($local_peer) { $sites_title = count_english_warning($sites,'site'); $toggle=new PlekitToggle('sites',$sites_title, - array('visible'=>get_arg('show_sites',false))); + array('visible'=>get_arg('show_sites'))); $toggle->start(); if (empty( $sites ) ) { @@ -292,32 +292,35 @@ if ($local_peer) { $table->row_end(); } - $table->row_start(); - - // get list of local sites that the person is not in - function get_site_id ($site) { return $site['site_id'];} - $person_site_ids=array_map("get_site_id",$sites); - $relevant_sites= $api->GetSites( array("peer_id"=>NULL,"~site_id"=>$person_site_ids), $site_columns); - // xxx cannot use onchange=submit() - would need to somehow pass action name - function site_selector($site) { return array('display'=>$site['name'],"value"=>$site['site_id']); } - $selectors = array_map ("site_selector",$relevant_sites); - $table->cell ($form->select_html("site_id",$selectors,array('label'=>"Choose a site to add")). - $form->submit_html("add-person-to-site","Add in site"), - array('hfill'=>true,'align'=>'right')); - $table->row_end(); + if (plc_is_admin()) + { + // NOTE: only admins can add users to different sites. + $table->row_start(); + // get list of local sites that the person is not in + function get_site_id ($site) { return $site['site_id'];} + $person_site_ids=array_map("get_site_id",$sites); + $relevant_sites= $api->GetSites( array("peer_id"=>NULL,"~site_id"=>$person_site_ids, '-SORT'=>'name'), $site_columns); + // xxx cannot use onchange=submit() - would need to somehow pass action name + function site_selector($site) { return array('display'=>$site['name'],"value"=>$site['site_id']); } + $selectors = array_map ("site_selector",$relevant_sites); + $table->cell ($form->select_html("site_id",$selectors,array('label'=>"Choose a site to add")). + $form->submit_html("add-person-to-site","Add in site"), + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } } $table->end(); $toggle->end(); } //////////////////// roles if ($local_peer) { - $toggle=new PlekitToggle ('roles','Roles',array('visible'=>get_arg('show_roles',false))); + $toggle=new PlekitToggle ('roles',count_english($roles,"role"),array('visible'=>get_arg('show_roles'))); $toggle->start(); if (! $roles) plc_warning ("This user has no role !"); - $can_manage_roles= ($local_peer && plc_is_admin()); - $table_options=array("search_area"=>false,"notes_area"=>false); + $is_pi_of_the_site = ( plc_in_site($site_ids[0]) && plc_is_pi() ); + $can_manage_roles= ( ($local_peer && plc_is_admin()) || $is_pi_of_the_site ); $headers=array("Role"=>"string"); if ($can_manage_roles) $headers [plc_delete_icon()]="none"; @@ -341,6 +344,8 @@ if ($local_peer) { // footers : the remove and add buttons if ($can_manage_roles) { + + // remove $table->tfoot_start(); if ($roles) { $table->row_start(); @@ -349,14 +354,26 @@ if ($local_peer) { $table->row_end(); } - $table->row_start(); - $selectors=$form->role_selectors_excluding($api,$role_ids); - $add_role_left_area=$form->select_html("role_id",$selectors,array('label'=>"Choose role")); - // add a role : the button - $add_role_right_area=$form->submit_html("add-role-to-person","Add role"); - $table->cell ($add_role_left_area . $add_role_right_area, - array('hfill'=>true,'align'=>'right')); - $table->row_end(); + // add + // compute the roles that can be added + if (plc_is_admin()) + // all roles + $exclude_role_ids=array(); + else + // all roles except admin and pi + $exclude_role_ids=array(10,20); + $possible_roles = roles_except($api->GetRoles(),$exclude_role_ids); + $roles_to_add = roles_except ($possible_roles,$role_ids); + if ( $roles_to_add ) { + $selectors=$form->role_selectors($roles_to_add); + $table->row_start(); + $add_role_left_area=$form->select_html("role_id",$selectors,array('label'=>"Choose role")); + // add a role : the button + $add_role_right_area=$form->submit_html("add-role-to-person","Add role"); + $table->cell ($add_role_left_area . $add_role_right_area, + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } } $table->end(); $toggle->end();