whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sam Ruby <ru...@apache.org>
Subject [whimsy.git] [1/1] Commit 7ad8fa1: fix https://issues.apache.org/jira/browse/WHIMSY-50
Date Thu, 03 Mar 2016 23:45:14 GMT
Commit 7ad8fa10864f7c53c6cbe38abf6ba05868b6c91e:
    fix https://issues.apache.org/jira/browse/WHIMSY-50


Branch: refs/heads/master
Author: Sam Ruby <rubys@intertwingly.net>
Committer: Sam Ruby <rubys@intertwingly.net>
Pusher: rubys <rubys@apache.org>

------------------------------------------------------------
lib/whimsy/asf/member.rb                                     | ++ --
lib/whimsy/asf/nominees.rb                                   | + -
www/members/watch.cgi                                        | +++ -
------------------------------------------------------------
10 changes: 6 additions, 4 deletions.
------------------------------------------------------------


diff --git a/lib/whimsy/asf/member.rb b/lib/whimsy/asf/member.rb
index 7cb9d85..b6def24 100644
--- a/lib/whimsy/asf/member.rb
+++ b/lib/whimsy/asf/member.rb
@@ -43,11 +43,11 @@ def self.find_by_email(value)
     def self.status
       begin
         return Hash[@status.to_a] if @status
-      rescue NoMethodError, WeakRef::RefError
+      rescue
       end
 
       status = {}
-      foundation = ASF::SVN['private/foundation']
+      foundation = ASF::SVN.find('private/foundation')
       return status unless foundation
       sections = File.read("#{foundation}/members.txt").split(/(.*\n===+)/)
       sections.shift(3)
diff --git a/lib/whimsy/asf/nominees.rb b/lib/whimsy/asf/nominees.rb
index 740f443..99d8b0a 100644
--- a/lib/whimsy/asf/nominees.rb
+++ b/lib/whimsy/asf/nominees.rb
@@ -7,7 +7,7 @@ class Person < Base
     def self.member_nominees
       begin
         return Hash[@member_nominees.to_a] if @member_nominees
-      rescue NoMethodError, WeakRef::RefError
+      rescue
       end
 
       meetings = ASF::SVN['private/foundation/Meetings']
diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index 16d6421..888989d 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -72,8 +72,10 @@ _html do
       list = watch_list
     end
 
-    # for efficiency, preload public_names
+    # for efficiency, preload public_names, member status, and nominees
     people = ASF::Person.preload('cn', list)
+    members = ASF::Member.status
+    nominees = ASF::Person.member_nominees
 
     _table do
 

Mime
View raw message