[whimsy] branch master updated: Display emeritus forms with actual urls

[cl...@apache.org]

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

clr 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 5e5818f  Display emeritus forms with actual urls
5e5818f is described below

commit 5e5818fc72a97b86dec40dcacc9307972699a2c3
Author: Craig L Russell <ap...@gmail.com>
AuthorDate: Thu Jun 4 17:23:03 2020 -0700

    Display emeritus forms with actual urls
---
 www/roster/models/committer.rb | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/www/roster/models/committer.rb b/www/roster/models/committer.rb
index 9110a6b..7944802 100644
--- a/www/roster/models/committer.rb
+++ b/www/roster/models/committer.rb
@@ -129,7 +129,10 @@ class Committer
       if person.icla and person.icla.claRef # Not all people have iclas
         claRef = person.icla.claRef.untaint
         file = ASF::ICLAFiles.match_claRef(claRef)
-        response[:forms][:icla] = file if file
+        if file
+          url =ASF::SVN.svnurl('iclas')
+          response[:forms][:icla] = "#{url}/#{file}"
+        end
       end
 
 
@@ -138,14 +141,35 @@ class Committer
 
         if person.icla # not all members have iclas
           file = ASF::MemApps.find1st(person)
-          response[:forms][:member] = file if file 
+          if file
+            url = ASF::SVN.svnurl('member_apps')
+            response[:forms][:member] = "#{url}/#{file}"
+          end
         end
 
         file = ASF::EmeritusFiles.find(person)
-        response[:forms][:emeritus] = file if file
+        if file
+          url = ASF::SVN.svnurl('emeritus')
+          response[:forms][:emeritus] = "#{url}/#{file}"
+        end
 
         file = ASF::EmeritusRequestFiles.find(person)
-        response[:forms][:emeritus_request] = file if file
+        if file
+          url = ASF::SVN.svnurl('emeritus-requests-received')
+          response[:forms][:emeritus_request] = "#{url}/#{file}"
+        end
+
+        file = ASF::EmeritusRescindedFiles.find(person)
+        if file
+          url = ASF::SVN.svnurl('emeritus-requests-rescinded')
+          response[:forms][:emeritus_rescinded] = "#{url}/#{file}"
+        end
+
+        file = ASF::EmeritusReinstatedFiles.find(person)
+        if file
+          url = ASF::SVN.svnurl('emeritus-reinstated')
+          response[:forms][:emeritus_reinstated] = "#{url}/#{file}"
+        end
 
       else
         if person.member_nomination