Skip to content

Commit

Permalink
Merge "Default to True for user_visible if db doesnt have entry for o…
Browse files Browse the repository at this point in the history
…bj."
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Dec 5, 2014
2 parents 5d269d2 + 151944e commit c7f3cc1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/config/api-server/vnc_perms.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def _multi_tenancy(self):
# end

def validate_user_visible_perm(self, id_perms, is_admin):
return id_perms['user_visible'] is not False or is_admin
return id_perms.get('user_visible', True) is not False or is_admin
# end

def validate_perms(self, request, uuid, mode=PERMS_R):
Expand Down Expand Up @@ -63,7 +63,7 @@ def validate_perms(self, request, uuid, mode=PERMS_R):
% ('+++' if ok else '---', self.mode_str[mode], uuid,
'yes' if is_admin else 'no', mode_mask, mask,
user, string.join(roles, ','), perms, owner, group,
id_perms['user_visible'])
id_perms.get('user_visible', True))
self._server_mgr.config_log(msg, level=SandeshLevel.SYS_DEBUG)

return (True, '') if ok else (False, err_msg)
Expand Down

0 comments on commit c7f3cc1

Please sign in to comment.