[whimsy] branch master updated: fix acreq so non incubator PMCs can be selected

[ru...@apache.org]

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

rubys 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 6bf11a2  fix acreq so non incubator PMCs can be selected
6bf11a2 is described below

commit 6bf11a27a39f1a40a37ef72932f91db1c81fc95a
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Jul 13 15:42:42 2017 -0400

    fix acreq so non incubator PMCs can be selected
---
 www/officers/acreq.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/officers/acreq.cgi b/www/officers/acreq.cgi
index a767c90..46c3488 100755
--- a/www/officers/acreq.cgi
+++ b/www/officers/acreq.cgi
@@ -28,7 +28,7 @@ APMAIL_BIN = ASF::SVN['infra/infrastructure/apmail/trunk/bin']
 SVN = ("svn --username #{Shellwords.escape env.user} " +
   "--password #{Shellwords.escape env.password}").untaint
 requests = `#{SVN} cat #{ACREQ}/new-account-reqs.txt`
-iclas_txt = `#{SVN} cat #{OFFICERS}/iclas.txt`
+iclas_txt = `#{SVN} cat #{OFFICERS}/iclas.txt`.force_encoding('utf-8')
 
 # grab the current list of PMCs from ldap
 pmcs = ASF::Committee.pmcs.map(&:name).sort
@@ -112,8 +112,8 @@ _html do
         if (#{@user.to_s.inspect} != '')
           $('#user').val(#{@user.to_s.inspect});
         $('#email').val(#{@email.to_s.inspect}).trigger('change');
-        @project ||= (@podling || @pmc)
-        $('#project').val(#{@project.to_s.inspect}).trigger('change').
+        var project = #{(@project || @podling || @pmc).to_s.inspect};
+        $('#project').val(project).trigger('change').
           attr('required', 'required');
         if (#{@votelink.to_s.inspect} != '')
           $('#votelink').val(#{@votelink.to_s.inspect});
@@ -251,7 +251,7 @@ _html do
                     @podling = @project
                     groups = "#@pmc,@podling"
                   else
-                    @pmc = 'incubator'
+                    @pmc = @project
                     @podling = nil
                     groups = "#@pmc"
                   end

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].