From 584e71ac4c7a93aedc0ab48dd1833a4e40641adc Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 9 Nov 2011 15:50:24 +0100 Subject: [PATCH] exclude the 'node' role from the dropdown menu when confusing --- planetlab/persons/person.php | 8 ++++---- planetlab/tags/tag.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/planetlab/persons/person.php b/planetlab/persons/person.php index ea948f9..5b74a7f 100644 --- a/planetlab/persons/person.php +++ b/planetlab/persons/person.php @@ -357,11 +357,11 @@ if ($local_peer) { // add // compute the roles that can be added if (plc_is_admin()) - // all roles - $exclude_role_ids=array(); + // all roles, except 'node' that does not make sense for a person + $exclude_role_ids=array(50); else - // all roles except admin and pi - $exclude_role_ids=array(10,20); + // all roles except admin and pi, and node to avoid confusing people + $exclude_role_ids=array(10,20,50); $possible_roles = roles_except($api->GetRoles(),$exclude_role_ids); $roles_to_add = roles_except ($possible_roles,$role_ids); if ( $roles_to_add ) { diff --git a/planetlab/tags/tag.php b/planetlab/tags/tag.php index d4458cf..dc228fe 100644 --- a/planetlab/tags/tag.php +++ b/planetlab/tags/tag.php @@ -153,11 +153,11 @@ if ($can_manage_roles) { // add // compute the roles that can be added if ($can_manage_roles) - // all roles + // all roles - don't exclude 'node' as it's actually meaningful for some tags $exclude_role_ids=array(); else - // all roles except admin and pi - $exclude_role_ids=array(10,20); + // all roles except admin and pi, and node to avoid confusing people + $exclude_role_ids=array(10,20,50); $possible_roles = roles_except($api->GetRoles(),$exclude_role_ids); $roles_to_add = roles_except ($possible_roles,$role_ids); if ( $roles_to_add ) { -- 2.43.0