You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cu...@apache.org on 2019/04/30 00:05:48 UTC

[whimsy] branch master updated: Point to new mentor-update

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 3caccb3  Point to new mentor-update
3caccb3 is described below

commit 3caccb310678b667d015fa414c8ea48e20f9b1cc
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Mon Apr 29 20:05:41 2019 -0400

    Point to new mentor-update
---
 www/members/mentors.cgi | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/www/members/mentors.cgi b/www/members/mentors.cgi
index 1b635a0..a183617 100755
--- a/www/members/mentors.cgi
+++ b/www/members/mentors.cgi
@@ -20,7 +20,7 @@ def read_mentor(file, mentors)
       mentors[id] = JSON.parse(File.read(file))
       mentors[id][MentorFormat::PUBLICNAME] = member.public_name()
     rescue StandardError => e
-      mentors[id] = { MentorFormat::ERRORS => "ERROR:read_mentor() #{e.message} #{e.backtrace[0]}"}
+      mentors[id] = { MentorFormat::ERRORS => "ERROR:read_mentor() #{e.message} #{e.backtrace[0]} from #{file}"}
     end
   else
     mentors[id] = { MentorFormat::ERRORS => "ERROR:ASF::Person.find(#{id}) returned nil from #{file}"}
@@ -69,11 +69,7 @@ _html do
             end
           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(MentorFormat::MENTORS_SVN, $USER + '.json')}", role: "button"
-        else
-          _a.btn.btn_default.btn_sm 'Volunteer To Mentor', href: "#{File.join(MentorFormat::MENTORS_SVN, 'README')}", role: "button"
-        end
+        _a.btn.btn_default.btn_sm (mentors.has_key?($USER) ? 'Edit Your Mentor Record' : 'Volunteer To Mentor'), href: "/members/mentor-update.cgi", role: "button"
       }
     ) do
       _div.panel_group id: MENTORS_LIST, role: "tablist", aria_multiselectable: "true" do