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 f861366c Emeritus => ASF Emeritus
f861366c is described below
commit f861366cd047bf8a78732123909928034165875f
Author: Sebb <[email protected]>
AuthorDate: Tue Dec 19 13:40:47 2023 +0000
Emeritus => ASF Emeritus
Somewhat of a hack; ideally the code needs to be centralised
---
www/roster/views/nonpmc/members.js.rb | 19 ++++++++++++-------
www/roster/views/pmc/committers.js.rb | 2 +-
www/roster/views/pmc/members.js.rb | 2 +-
www/roster/views/ppmc/committers.js.rb | 2 +-
www/roster/views/ppmc/members.js.rb | 2 +-
www/roster/views/ppmc/mentors.js.rb | 2 +-
6 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/www/roster/views/nonpmc/members.js.rb
b/www/roster/views/nonpmc/members.js.rb
index f16bf5ef..7467639f 100644
--- a/www/roster/views/nonpmc/members.js.rb
+++ b/www/roster/views/nonpmc/members.js.rb
@@ -70,16 +70,21 @@ class NonPMCMember < Vue
onClick: -> {self.toggleSelect(@@person)}
end
end
- if @@person.member
- _td { _b { _a @@person.id, href: "committer/#{@@person.id}" }
- _a ' (*)', href: "nonpmc/#{@@nonpmc.id}#crosscheck" if
@@person.notSubbed
- }
+
+ if @@person.member == true # full member
+ _td { _b { _a @@person.id, href: "committer/#{@@person.id}"} }
_td @@person.githubUsername
_td { _b @@person.name }
+ elsif @@person.member
+ _td { _i { _a @@person.id, href: "committer/#{@@person.id}"} }
+ _td @@person.githubUsername
+ _td { _i @@person.name
+ _ ' ('
+ _ @@person.member.sub(%r{( \(Non-voting\))? Member},
'').sub(%r{^Emeritus}, 'ASF Emeritus')
+ _ ')'
+ }
else
- _td { _a @@person.id, href: "committer/#{@@person.id}"
- _a ' (*)', href: "nonpmc/#{@@nonpmc.id}#crosscheck" if
@@person.notSubbed
- }
+ _td { _a @@person.id, href: "committer/#{@@person.id}" }
_td @@person.githubUsername
_td @@person.name
end
diff --git a/www/roster/views/pmc/committers.js.rb
b/www/roster/views/pmc/committers.js.rb
index 74d3ecbd..74a1135e 100644
--- a/www/roster/views/pmc/committers.js.rb
+++ b/www/roster/views/pmc/committers.js.rb
@@ -79,7 +79,7 @@ class PMCCommitter < Vue
_td @@person.githubUsername
_td { _i @@person.name
_ ' ('
- _ @@person.member.sub(%r{( \(Non-voting\))? Member}, '')
+ _ @@person.member.sub(%r{( \(Non-voting\))? Member},
'').sub(%r{^Emeritus}, 'ASF Emeritus')
_ ')'
}
else
diff --git a/www/roster/views/pmc/members.js.rb
b/www/roster/views/pmc/members.js.rb
index 486bf55d..d98b6c35 100644
--- a/www/roster/views/pmc/members.js.rb
+++ b/www/roster/views/pmc/members.js.rb
@@ -190,7 +190,7 @@ class PMCMember < Vue
_td @@person.githubUsername
_td { _i @@person.name
_ ' ('
- _ @@person.member.sub(%r{( \(Non-voting\))? Member}, '')
+ _ @@person.member.sub(%r{( \(Non-voting\))? Member},
'').sub(%r{^Emeritus}, 'ASF Emeritus')
_ ')'
}
else
diff --git a/www/roster/views/ppmc/committers.js.rb
b/www/roster/views/ppmc/committers.js.rb
index bc424ddd..5cc09701 100644
--- a/www/roster/views/ppmc/committers.js.rb
+++ b/www/roster/views/ppmc/committers.js.rb
@@ -106,7 +106,7 @@ class PPMCCommitter < Vue
_td @@person.githubUsername
_td { _i @@person.name
_ ' ('
- _ @@person.member.sub(%r{( \(Non-voting\))? Member}, '')
+ _ @@person.member.sub(%r{( \(Non-voting\))? Member},
'').sub(%r{^Emeritus}, 'ASF Emeritus')
_ ')'
}
else
diff --git a/www/roster/views/ppmc/members.js.rb
b/www/roster/views/ppmc/members.js.rb
index ade7d766..ad669a38 100644
--- a/www/roster/views/ppmc/members.js.rb
+++ b/www/roster/views/ppmc/members.js.rb
@@ -146,7 +146,7 @@ class PPMCMember < Vue
_td @@person.githubUsername
_td { _i @@person.name
_ ' ('
- _ @@person.member.sub(%r{( \(Non-voting\))? Member}, '')
+ _ @@person.member.sub(%r{( \(Non-voting\))? Member},
'').sub(%r{^Emeritus}, 'ASF Emeritus')
_ ')'
}
else
diff --git a/www/roster/views/ppmc/mentors.js.rb
b/www/roster/views/ppmc/mentors.js.rb
index efc77298..26520f68 100644
--- a/www/roster/views/ppmc/mentors.js.rb
+++ b/www/roster/views/ppmc/mentors.js.rb
@@ -70,7 +70,7 @@ class PPMCMentor < Vue
_td @@person.githubUsername
_td { _i @@person.name
_ ' ('
- _ @@person.member.sub(%r{( \(Non-voting\))? Member}, '')
+ _ @@person.member.sub(%r{( \(Non-voting\))? Member},
'').sub(%r{^Emeritus}, 'ASF Emeritus')
_ ')'
}
elsif @@person.name
