(whimsy) branch master updated: Allow for non-standard LDAP project names

[sebb]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new cbbe6813 Allow for non-standard LDAP project names
cbbe6813 is described below

commit cbbe6813f375eedce96287b591f1724ca56cfc9d
Author: Sebb <s...@apache.org>
AuthorDate: Mon Jun 15 22:16:50 2026 +0100

    Allow for non-standard LDAP project names
---
 lib/whimsy/asf/ldap.rb | 19 ++++++++++++++++++-
 www/roster/main.rb     |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index bc005a77..2774c769 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -1254,12 +1254,29 @@ module ASF
       ASF.search_one(base, filter, 'cn').flatten
     end
 
+    # LDAP project name overrides
+    def self.ldapname(name)
+      canon = ASF::Committee.to_canonical(name)
+      case canon
+      when 'dataprivacy'
+        'privacy'
+      when 'concom'
+        'conferences'
+      else
+        canon
+      end
+    end
+
     # return project only if it actually exits
     def self.[](name)
-      project = super
+      project = super ldapname(name)
       project.dn ? project : nil
     end
 
+    def self.find(name)
+      super ldapname(name)
+    end
+
     # fetch <tt>dn</tt>, <tt>member</tt>, <tt>modifyTimestamp</tt>, and
     # <tt>createTimestamp</tt> for all projects in LDAP.
     def self.preload
diff --git a/www/roster/main.rb b/www/roster/main.rb
index 63808fb8..3c05c26f 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -81,7 +81,7 @@ end
 get '/other/' do
   otherids = ASF::Project.list.map(&:name) -
                 ASF::Committee.pmcs.map(&:name) -
-                ASF::Committee.nonpmcs.map(&:name) -
+                ASF::Committee.nonpmcs.map{|x| ASF::Project.ldapname x.name} -
                 ASF::Podling.currentids -
                 ASF::Petri.list.map(&:id)
   attics = ASF::Committee.load_committee_metadata[:tlps].filter {|k,v| 
v[:retired]}