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 65b61e1 Ignore archivers when getting the subscribers rather than
later
65b61e1 is described below
commit 65b61e1276ae428e8358e79cabb607dd35c4b53f
Author: Sebb <[email protected]>
AuthorDate: Tue Apr 30 13:51:56 2019 +0100
Ignore archivers when getting the subscribers rather than later
---
www/board/subscriptions.cgi | 12 +-----------
www/members/subscriptions.cgi | 11 +----------
2 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/www/board/subscriptions.cgi b/www/board/subscriptions.cgi
index d71dc4f..690c6af 100755
--- a/www/board/subscriptions.cgi
+++ b/www/board/subscriptions.cgi
@@ -7,18 +7,9 @@ require 'wunderbar/bootstrap'
require 'whimsy/asf'
require 'whimsy/asf/mlist'
-ARCHIVERS = %w(
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
-)
-
info_chairs = ASF::Committee.load_committee_info.group_by(&:chair)
ldap_chairs = ASF.pmc_chairs
-subscribers, modtime = ASF::MLIST.board_subscribers
+subscribers, modtime = ASF::MLIST.board_subscribers(false) # excluding
archivers
_html do
_body? do
@@ -95,7 +86,6 @@ _html do
end
_tbody do
ids.sort.each do |id, person, email|
- next if ARCHIVERS.include? email
_tr_ do
href = "/roster/committer/#{id}"
if person.asf_member?
diff --git a/www/members/subscriptions.cgi b/www/members/subscriptions.cgi
index edede19..e69ae5e 100755
--- a/www/members/subscriptions.cgi
+++ b/www/members/subscriptions.cgi
@@ -8,15 +8,7 @@ require 'whimsy/asf/mlist'
require 'wunderbar/bootstrap'
require 'wunderbar/jquery/stupidtable'
-ARCHIVERS = %w(
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
-)
-
-subscribers, modtime = ASF::MLIST.members_subscribers
+subscribers, modtime = ASF::MLIST.members_subscribers(false) # excluding
archivers
_html do
_body? do
@@ -91,7 +83,6 @@ _html do
_th 'name', data_sort: 'string'
end
subscriptions.sort.each do |id, person, email|
- next if ARCHIVERS.include? email
_tr_ do
if id.include? '*'
_td.text_danger id
