[whimsy] 01/02: block access to legal name

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 6bd0778b0aec2bec3e0767cdb7710c91c21c451d
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Nov 18 21:20:35 2017 -0500

    block access to legal name
---
 www/roster/models/committer.rb         | 5 ++++-
 www/roster/views/person/fullname.js.rb | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/roster/models/committer.rb b/www/roster/models/committer.rb
index d577193..85c7177 100644
--- a/www/roster/models/committer.rb
+++ b/www/roster/models/committer.rb
@@ -22,7 +22,10 @@ class Committer
 
     if person.icla
       name[:public_name] = person.public_name
-      name[:legal_name] = person.icla.legal_name
+
+      if id == env.user or ASF::Person.find(env.user).asf_member?
+        name[:legal_name] = person.icla.legal_name
+      end
     end
 
     unless person.attrs['cn'].empty?
diff --git a/www/roster/views/person/fullname.js.rb b/www/roster/views/person/fullname.js.rb
index c75cd8a..81e59b4 100644
--- a/www/roster/views/person/fullname.js.rb
+++ b/www/roster/views/person/fullname.js.rb
@@ -39,7 +39,7 @@ class PersonName < Vue
         else
 
           if 
-            name.public_name==name.legal_name and 
+            (not name.legal_name or name.public_name==name.legal_name) and 
             name.public_name==name.ldap
           then
             _span committer.name.public_name

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.