You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2022/02/09 16:01:33 UTC

[whimsy] branch master updated (13115de -> 7694c66)

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

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


    from 13115de  Move podlings away from .archives
     new c23675f  Move nonpmcs away from .archives
     new 7694c66  Typo

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 www/roster/models/nonpmc.rb        | 9 +++------
 www/roster/views/nonpmc/main.js.rb | 8 +-------
 2 files changed, 4 insertions(+), 13 deletions(-)

[whimsy] 01/02: Move nonpmcs away from .archives

Posted by se...@apache.org.
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

commit c23675f5d063427571a392d239c641f6ac3d16af
Author: Sebb <se...@apache.org>
AuthorDate: Wed Feb 9 15:59:55 2022 +0000

    Move nonpmcs away from .archives
---
 www/roster/models/nonpmc.rb        | 7 ++-----
 www/roster/views/nonpmc/main.js.rb | 8 +-------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/www/roster/models/nonpmc.rb b/www/roster/models/nonpmc.rb
index bce96b7..06d05c2 100644
--- a/www/roster/models/nonpmc.rb
+++ b/www/roster/models/nonpmc.rb
@@ -15,10 +15,6 @@ class NonPMC
     # We'll be needing the mail data later
     ASF::Person.preload(['cn', 'mail', 'asf-altEmail', 'githubUsername'], (members + committers).uniq)
 
-    lists = ASF::Mail.lists(true).select do |list, _|
-      list =~ /^#{mail_list}\b/
-    end
-
     image = ASF::SiteImage.find(id)
 
     moderators = nil
@@ -48,8 +44,9 @@ class NonPMC
         sSubs = ASF::MLIST.security_subscribers(mail_list)[0]||[]
         unMatchedSecSubs = Set.new(sSubs) # init ready to remove matched mails
       end
+      lists = ASF::MLIST.domain_lists(mail_list, true)
     else
-      lists = lists.select {|_, mode| mode == 'public'}
+      lists = ASF::MLIST.domain_lists(mail_list, false)
     end
 
     roster = cttee.roster.dup
diff --git a/www/roster/views/nonpmc/main.js.rb b/www/roster/views/nonpmc/main.js.rb
index ceaaa9b..ccbca68 100644
--- a/www/roster/views/nonpmc/main.js.rb
+++ b/www/roster/views/nonpmc/main.js.rb
@@ -143,13 +143,7 @@ class NonPMC < Vue
     else
       _h2.mail! 'Mail lists'
       _ul do
-        for mail_name in @nonpmc.mail
-          if mail_name.include? '-'
-            parsed = mail_name.match(/^(.*?)-(.*)/)
-            list_name = "#{parsed[2]}@#{parsed[1]}.apache.org"
-          else
-            list_name = "#{mail_name}@apache.org"
-          end
+        for list_name in @nonpmc.mail
           _li do
             _a list_name, href: 'https://lists.apache.org/list.html?' +
               list_name

[whimsy] 02/02: Typo

Posted by se...@apache.org.
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

commit 7694c6620df7cb6a2ebf699127740754bb821262
Author: Sebb <se...@apache.org>
AuthorDate: Wed Feb 9 16:01:23 2022 +0000

    Typo
---
 www/roster/models/nonpmc.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/roster/models/nonpmc.rb b/www/roster/models/nonpmc.rb
index 06d05c2..5f224e2 100644
--- a/www/roster/models/nonpmc.rb
+++ b/www/roster/models/nonpmc.rb
@@ -53,7 +53,7 @@ class NonPMC
     # if the roster is empty, then add the chair(s)
     if roster.empty?
       cttee.chairs.each do |ch|
-        roster[ch[:id]] = {name: ch[:name], date: 'uknown'} # it is used to flag CI data so must be true in JavaScript
+        roster[ch[:id]] = {name: ch[:name], date: 'unkown'} # it is used to flag CI data so must be true in JavaScript
       end
     end
     cttee_members = roster.keys # get the potentially updated list