This is an automated email from the ASF dual-hosted git repository.
sebb 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 269661cd Add infra-admin and links to user pages
269661cd is described below
commit 269661cde10edd8635d65a19d38332376c809b4b
Author: Sebb <[email protected]>
AuthorDate: Thu Jul 24 17:18:24 2025 +0100
Add infra-admin and links to user pages
---
lib/whimsy/asf/orgchart.rb | 13 +++++++++++--
www/foundation/orgchart.cgi | 2 +-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/lib/whimsy/asf/orgchart.rb b/lib/whimsy/asf/orgchart.rb
index a4301545..b54f45ac 100644
--- a/lib/whimsy/asf/orgchart.rb
+++ b/lib/whimsy/asf/orgchart.rb
@@ -28,7 +28,7 @@ module ASF # :nodoc:
data['info'] = YAML.safe_load(data['info'])
name = @@aliases[name] || name
# fix up data items available from elsewhere
- if name =~ %r{^vp-(.+)$} or name =~ %r{^(security)$}
+ if name =~ %r{^vp-(.+)$} or name =~
%r{^(security|infrastructureadministrator)$}
post = $1
begin
data['info']['id'] = ASF::Committee[post].chairs.map {|a| a[:id]}
@@ -44,7 +44,7 @@ module ASF # :nodoc:
if tmp
data['info']['id'] = tmp.chairs.map {|a| a[:id]}
else
- Wunderbar.info "Cannot find chair for #{name}"
+ Wunderbar.info "Cannot find chair2 for #{name}"
end
end
data['mtime'] = File.mtime(file).to_f
@@ -80,3 +80,12 @@ module ASF # :nodoc:
end
end
end
+if __FILE__ == $0
+ $LOAD_PATH.unshift '/srv/whimsy/lib'
+ require 'whimsy/asf'
+ Wunderbar.log_level = 'DEBUG'
+ org = ASF::OrgChart.load
+ org.each.map do |k, v|
+ p [k, (v['info']['id'] || v['info']['chair'] || '?')]
+ end
+end
\ No newline at end of file
diff --git a/www/foundation/orgchart.cgi b/www/foundation/orgchart.cgi
index 2d3db906..af79f86b 100755
--- a/www/foundation/orgchart.cgi
+++ b/www/foundation/orgchart.cgi
@@ -50,7 +50,7 @@ def emit_orgchart(org: {})
if missingid
_em id
else
- _ idnam
+ _a idnam, href: "/roster/committer/#{id.first}"
end
end
_td do
