[whimsy] branch master updated: No need for guineapig checks anymore here

[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


The following commit(s) were added to refs/heads/master by this push:
     new c1180da  No need for guineapig checks anymore here
c1180da is described below

commit c1180da292d86291b9b6bc1368d114871e4e3848
Author: Sebb <se...@apache.org>
AuthorDate: Thu Jan 31 09:38:57 2019 +0000

    No need for guineapig checks anymore here
    
    All projects are guineapigs now...
---
 www/roster/models/committee.rb     | 1 -
 www/roster/models/nonpmc.rb        | 1 -
 www/roster/views/nonpmc/main.js.rb | 9 +++------
 www/roster/views/pmc/main.js.rb    | 8 ++------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index 43aaf65..76a64ff 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -163,7 +163,6 @@ class Committee
       nonASFmails: nonASFmails,
       project_info: info,
       image: image,
-      guinea_pig: ASF::Committee::isGuineaPig?(id),
       analysePrivateSubs: analysePrivateSubs,
       unknownSubs: unknownSubs,
       asfMembers: asfMembers,
diff --git a/www/roster/models/nonpmc.rb b/www/roster/models/nonpmc.rb
index 21243fc..8453fcb 100644
--- a/www/roster/models/nonpmc.rb
+++ b/www/roster/models/nonpmc.rb
@@ -166,7 +166,6 @@ class NonPMC
       subtime: subtime,
       nonASFmails: nonASFmails,
       image: image,
-      guinea_pig: ASF::Committee::isGuineaPig?(id),
       analysePrivateSubs: analysePrivateSubs,
       unknownSubs: unknownSubs,
       asfMembers: asfMembers,
diff --git a/www/roster/views/nonpmc/main.js.rb b/www/roster/views/nonpmc/main.js.rb
index 01919d8..6c708a6 100644
--- a/www/roster/views/nonpmc/main.js.rb
+++ b/www/roster/views/nonpmc/main.js.rb
@@ -8,12 +8,9 @@ class NonPMC < Vue
   end
 
   def render
-    if @nonpmc.guinea_pig
-      auth = (@@auth.secretary or @@auth.root or
-        @nonpmc.members.include? @@auth.id)
-    else
-      auth = (@@auth.id == @nonpmc.chair or @@auth.secretary or @@auth.root)
-    end
+    # TODO establish the correct auth for non-PMCs - may not have LDAP
+#    auth = (@@auth.secretary or @@auth.root or
+#      @nonpmc.members.include? @@auth.id)
 
     auth = nil # The modules have not been checked
 
diff --git a/www/roster/views/pmc/main.js.rb b/www/roster/views/pmc/main.js.rb
index 0728df4..2e88fbb 100644
--- a/www/roster/views/pmc/main.js.rb
+++ b/www/roster/views/pmc/main.js.rb
@@ -8,12 +8,8 @@ class PMC < Vue
   end
 
   def render
-    if @committee.guinea_pig
-      auth = (@@auth.secretary or @@auth.root or
-        @committee.members.include? @@auth.id)
-    else
-      auth = (@@auth.id == @committee.chair or @@auth.secretary or @@auth.root)
-    end
+    auth = (@@auth.secretary or @@auth.root or
+      @committee.members.include? @@auth.id)
 
     # add jump links to main sections of page using Bootstrap nav element
     _ul.nav.nav_pills do