[whimsy] branch master updated: Don't use eval

[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 21cbe2d  Don't use eval
21cbe2d is described below

commit 21cbe2d2e5816bc4a571712088861c239b6f0fa4
Author: Sebb <se...@apache.org>
AuthorDate: Tue Dec 29 23:07:30 2020 +0000

    Don't use eval
---
 www/roster/main.rb                  | 2 ++
 www/roster/views/committers.html.rb | 2 +-
 www/roster/views/iclas.html.rb      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/roster/main.rb b/www/roster/main.rb
index f9e085a..fc2210f 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -117,6 +117,7 @@ get '/committer2/' do
   # Restrict who can see this
   pass unless @auth[:member] or @auth[:pmc_chair]
   @notinavail = true
+  @iclapath = ASF::SVN.svnpath!('iclas') # needed if notinavail is true
   _html :committers
 end
 
@@ -209,6 +210,7 @@ get '/icla/' do
   @auth = Auth.info(env)
   # Restrict who can see this
   pass unless @auth[:member] or @auth[:pmc_chair]
+  @iclapath = ASF::SVN.svnpath!('iclas')
   _html :iclas
 end
 
diff --git a/www/roster/views/committers.html.rb b/www/roster/views/committers.html.rb
index 399b76a..bb2bc11 100644
--- a/www/roster/views/committers.html.rb
+++ b/www/roster/views/committers.html.rb
@@ -25,7 +25,7 @@ _html do
     _.render '#main' do
       _CommitterSearch notinavail: @notinavail,
                        # This ends with '/'
-                       iclapath: `ASF::SVN.svnpath!('iclas').inspect`
+                       iclapath: @iclapath
     end
   end
 end
diff --git a/www/roster/views/iclas.html.rb b/www/roster/views/iclas.html.rb
index c5c7e61..75e058e 100644
--- a/www/roster/views/iclas.html.rb
+++ b/www/roster/views/iclas.html.rb
@@ -15,7 +15,7 @@ _html do
     _div_.main!
     _script src: "app.js?#{appmtime}"
     _.render '#main' do
-      _IclaSearch iclapath: `ASF::SVN.svnpath!('iclas').inspect`
+      _IclaSearch iclapath: @iclapath
     end
   end
 end