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 d6b55b29 Distinguish member types in listings
d6b55b29 is described below
commit d6b55b295e61388a2f2e4f5293aa25f9aff60671
Author: Sebb <[email protected]>
AuthorDate: Sun May 14 17:45:52 2023 +0100
Distinguish member types in listings
---
www/roster/views/pmc/committers.js.rb | 10 +++++++++-
www/roster/views/pmc/members.js.rb | 12 +++++++++++-
www/roster/views/ppmc/committers.js.rb | 10 +++++++++-
www/roster/views/ppmc/members.js.rb | 12 +++++++++++-
www/roster/views/ppmc/mentors.js.rb | 12 +++++++++++-
5 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/www/roster/views/pmc/committers.js.rb
b/www/roster/views/pmc/committers.js.rb
index 64a53f4e..74d3ecbd 100644
--- a/www/roster/views/pmc/committers.js.rb
+++ b/www/roster/views/pmc/committers.js.rb
@@ -70,10 +70,18 @@ class PMCCommitter < Vue
end
end
- if @@person.member
+ 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}, '')
+ _ ')'
+ }
else
_td { _a @@person.id, href: "committer/#{@@person.id}" }
_td @@person.githubUsername
diff --git a/www/roster/views/pmc/members.js.rb
b/www/roster/views/pmc/members.js.rb
index cf6e26f2..486bf55d 100644
--- a/www/roster/views/pmc/members.js.rb
+++ b/www/roster/views/pmc/members.js.rb
@@ -177,12 +177,22 @@ class PMCMember < Vue
onClick: -> {self.toggleSelect(@@person)}
end
end
- if @@person.member
+ if @@person.member == true # full member
_td { _b { _a @@person.id, href: "committer/#{@@person.id}" }
_a ' (*)', href: "committee/#{@@committee.id}#crosscheck" if
@@person.notSubbed
}
_td @@person.githubUsername
_td { _b @@person.name }
+ elsif @@person.member
+ _td { _i { _a @@person.id, href: "committer/#{@@person.id}" }
+ _a ' (*)', href: "committee/#{@@committee.id}#crosscheck" if
@@person.notSubbed
+ }
+ _td @@person.githubUsername
+ _td { _i @@person.name
+ _ ' ('
+ _ @@person.member.sub(%r{( \(Non-voting\))? Member}, '')
+ _ ')'
+ }
else
_td { _a @@person.id, href: "committer/#{@@person.id}"
_a ' (*)', href: "committee/#{@@committee.id}#crosscheck" if
@@person.notSubbed
diff --git a/www/roster/views/ppmc/committers.js.rb
b/www/roster/views/ppmc/committers.js.rb
index a9ab7554..bc424ddd 100644
--- a/www/roster/views/ppmc/committers.js.rb
+++ b/www/roster/views/ppmc/committers.js.rb
@@ -97,10 +97,18 @@ class PPMCCommitter < Vue
end
end
- if @@person.member
+ 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}, '')
+ _ ')'
+ }
else
_td { _a @@person.id, href: "committer/#{@@person.id}" }
_td @@person.githubUsername
diff --git a/www/roster/views/ppmc/members.js.rb
b/www/roster/views/ppmc/members.js.rb
index 5864eabc..ade7d766 100644
--- a/www/roster/views/ppmc/members.js.rb
+++ b/www/roster/views/ppmc/members.js.rb
@@ -133,12 +133,22 @@ class PPMCMember < Vue
end
end
- if @@person.member
+ if @@person.member == true # full member
_td { _b { _a @@person.id, href: "committer/#{@@person.id}" }
_a ' (*)', href: "ppmc/#{@@ppmc.id}#crosscheck" if
@@person.notSubbed
}
_td @@person.githubUsername
_td { _b @@person.name }
+ elsif @@person.member
+ _td { _i { _a @@person.id, href: "committer/#{@@person.id}" }
+ _a ' (*)', href: "ppmc/#{@@ppmc.id}#crosscheck" if
@@person.notSubbed
+ }
+ _td @@person.githubUsername
+ _td { _i @@person.name
+ _ ' ('
+ _ @@person.member.sub(%r{( \(Non-voting\))? Member}, '')
+ _ ')'
+ }
else
_td { _a @@person.id, href: "committer/#{@@person.id}"
_a ' (*)', href: "ppmc/#{@@ppmc.id}#crosscheck" if
@@person.notSubbed
diff --git a/www/roster/views/ppmc/mentors.js.rb
b/www/roster/views/ppmc/mentors.js.rb
index 85646d59..efc77298 100644
--- a/www/roster/views/ppmc/mentors.js.rb
+++ b/www/roster/views/ppmc/mentors.js.rb
@@ -57,12 +57,22 @@ class PPMCMentor < Vue
end
end
- if @@person.member
+ if @@person.member == true # full member
_td { _b { _a @@person.id, href: "committer/#{@@person.id}" }
_a ' (*)', href: "ppmc/#{@@ppmc.id}#crosscheck" if
@@person.notSubbed
}
_td @@person.githubUsername
_td { _b @@person.name }
+ elsif @@person.member
+ _td { _i { _a @@person.id, href: "committer/#{@@person.id}" }
+ _a ' (*)', href: "ppmc/#{@@ppmc.id}#crosscheck" if
@@person.notSubbed
+ }
+ _td @@person.githubUsername
+ _td { _i @@person.name
+ _ ' ('
+ _ @@person.member.sub(%r{( \(Non-voting\))? Member}, '')
+ _ ')'
+ }
elsif @@person.name
_td { _a @@person.id, href: "committer/#{@@person.id}"
_a ' (*)', href: "ppmc/#{@@ppmc.id}#crosscheck" if
@@person.notSubbed
