whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] branch master updated: Ooops, need the data in the right path too
Date Wed, 24 Apr 2019 13:49:17 GMT
This is an automated email from the ASF dual-hosted git repository.

curcuru 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 8dd88e9  Ooops, need the data in the right path too
8dd88e9 is described below

commit 8dd88e9cd870d4da3e454d0eeba2a2e8eb5c029f
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Wed Apr 24 09:49:09 2019 -0400

    Ooops, need the data in the right path too
---
 repository.yml          |  3 +++
 www/members/mentors.cgi | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/repository.yml b/repository.yml
index b84c074..a47de77 100644
--- a/repository.yml
+++ b/repository.yml
@@ -42,6 +42,9 @@
   foundation_board:
     url: private/foundation/board
 
+  foundation_mentors:
+    url: private/foundation/mentors
+
   grants:
     url: private/documents/grants
 
diff --git a/www/members/mentors.cgi b/www/members/mentors.cgi
index 7bacab1..3b60ffd 100755
--- a/www/members/mentors.cgi
+++ b/www/members/mentors.cgi
@@ -8,9 +8,7 @@ require 'wunderbar/markdown'
 require 'json'
 
 ROSTER = 'https://whimsy.apache.org/roster/committer/'
-FOUNDATION_SVN = 'https://svn.apache.org/repos/private/foundation/'
-FOUNDATION = ASF::SVN['foundation']
-MENTORS_PATH = 'mentors'
+MENTORS_SVN = 'https://svn.apache.org/repos/private/foundation/mentors/'
 PUBLICNAME = 'publicname'
 NOTAVAILABLE = 'notavailable'
 ERRORS = 'errors'
@@ -59,7 +57,7 @@ end
 # produce HTML
 _html do
   _body? do
-    mentors = read_mentors(File.join(FOUNDATION, MENTORS_PATH))
+    mentors = read_mentors(ASF::SVN['foundation_mentors'])
     errors, mentors = mentors.partition{ |k,v| v.has_key?(ERRORS)}.map(&:to_h)
     notavailable, mentors = mentors.partition{ |k,v| v.has_key?(NOTAVAILABLE)}.map(&:to_h)
     _whimsy_body(
@@ -84,9 +82,9 @@ _html do
           end
         end
         if mentors.has_key?($USER) # TODO make a whimsy UI for this
-          _a.btn.btn_default.btn_sm 'Edit Your Mentor Record', href: "#{File.join(FOUNDATION_SVN,
MENTORS_PATH, $USER + '.json')}", role: "button"
+          _a.btn.btn_default.btn_sm 'Edit Your Mentor Record', href: "#{File.join(MENTORS_SVN,
$USER + '.json')}", role: "button"
         else
-          _a.btn.btn_default.btn_sm 'Volunteer To Mentor', href: "#{File.join(FOUNDATION_SVN,
MENTORS_PATH, 'README')}", role: "button"
+          _a.btn.btn_default.btn_sm 'Volunteer To Mentor', href: "#{File.join(MENTORS_SVN,
'README')}", role: "button"
         end
       }
       ) do


Mime
View raw message