whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Use the official member(id)s methods
Date Fri, 10 May 2019 23:34:33 GMT
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 73a66cd  Use the official member(id)s methods
73a66cd is described below

commit 73a66cdb5c9442304d8efd69df24263ef579962b
Author: Sebb <sebb@apache.org>
AuthorDate: Sat May 11 00:33:50 2019 +0100

    Use the official member(id)s methods
---
 www/members/subscriptions.cgi                        | 2 +-
 www/secretary/workbench/views/actions/memapp.json.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/members/subscriptions.cgi b/www/members/subscriptions.cgi
index e69ae5e..f263248 100755
--- a/www/members/subscriptions.cgi
+++ b/www/members/subscriptions.cgi
@@ -56,7 +56,7 @@ _html do
         end
       }
     ) do
-    ldap = ASF::Group['member'].members
+    ldap = ASF.members
 
     members = ASF::Member.new.map {|id, text| ASF::Person.find(id)}
     ASF::Person.preload('cn', members)
diff --git a/www/secretary/workbench/views/actions/memapp.json.rb b/www/secretary/workbench/views/actions/memapp.json.rb
index 52ed46c..8329626 100644
--- a/www/secretary/workbench/views/actions/memapp.json.rb
+++ b/www/secretary/workbench/views/actions/memapp.json.rb
@@ -120,7 +120,7 @@ task "update cn=member,ou=groups,dc=apache,dc=org in LDAP" do
 
   complete do
     ldap = ASF.init_ldap(true)
-    if ASF::Group.find('member').include? ASF::Person.find(@availid)
+    if ASF.memberids.include? @availid
       _transcript ["#@availid already in group member"]
     else
       ldap.bind("uid=#{env.user.untaint},ou=people,dc=apache,dc=org",


Mime
View raw message