whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [whimsy] branch master updated: Update display for forms
Date Fri, 05 Jun 2020 00:15:52 GMT
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 85e76de  Update display for forms
85e76de is described below

commit 85e76decf9296ae230a615ce61c9f70a07f9f049
Author: Craig L Russell <apache.clr@gmail.com>
AuthorDate: Thu Jun 4 17:11:11 2020 -0700

    Update display for forms
---
 www/roster/views/person/forms.js.rb | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/www/roster/views/person/forms.js.rb b/www/roster/views/person/forms.js.rb
index 3b095c8..172a10e 100644
--- a/www/roster/views/person/forms.js.rb
+++ b/www/roster/views/person/forms.js.rb
@@ -20,7 +20,7 @@ class PersonForms < Vue
                 if link == '' # has ICLA bu no karma to view it
                   _ 'ICLA'
                 else
-                  _a 'ICLA', href: "#{documents}/iclas/#{link}"
+                  _a 'ICLA', href: "#{link}"
                 end
               end
             elsif form == 'member'
@@ -29,7 +29,7 @@ class PersonForms < Vue
                   _ 'Member App'
                 else
                   _a 'Member App',
-                    href: "#{documents}/member_apps/#{link}"
+                    href: "#{link}"
                 end
               end
             elsif form == 'emeritus'
@@ -38,7 +38,7 @@ class PersonForms < Vue
                   _ 'Emeritus'
                 else
                   _a 'Emeritus',
-                    href: "#{documents}/emeritus/#{link}"
+                    href: "#{link}"
                 end
               end
             elsif form == 'emeritus_request'
@@ -47,7 +47,25 @@ class PersonForms < Vue
                   _ 'Emeritus Request'
                 else
                   _a 'Emeritus Request',
-                    href: "#{documents}/emeritus-requests-received/#{link}"
+                    href: "#{link}"
+                end
+              end
+            elsif form == 'emeritus_rescinded'
+              _li do
+                if link == '' # has form but no karma to view it
+                  _ 'Emeritus Rescinded'
+                else
+                  _a 'Emeritus Rescinded',
+                    href: "#{link}"
+                end
+              end
+            elsif form == 'emeritus_reinstated'
+              _li do
+                if link == '' # has form but no karma to view it
+                  _ 'Emeritus Reinstated'
+                else
+                  _a 'Emeritus Reinstated',
+                    href: "#{link}"
                 end
               end
             else


Mime
View raw message