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: Fix loadProgress bug with local/globals
Date Fri, 26 Jan 2018 01:52:04 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 63dbedc  Fix loadProgress bug with local/globals
63dbedc is described below

commit 63dbedcae10e894d5dd68575792d4891d2b60416
Author: Craig L Russell <craig.russell@oracle.com>
AuthorDate: Thu Jan 25 17:51:54 2018 -0800

    Fix loadProgress bug with local/globals
---
 www/project/icla/main.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/project/icla/main.rb b/www/project/icla/main.rb
index c51f400..aa45d08 100755
--- a/www/project/icla/main.rb
+++ b/www/project/icla/main.rb
@@ -65,8 +65,8 @@ end
 
 get '/' do
   @token = params['token']
-  @progress = loadProgress(@token) if @token
-  @phase = @progress[:phase] if @progress
+  loadProgress(@token) if @token
+  @phase = @progress['phase'] if @progress
   if @phase == 'discuss'
     redirect to("/discuss?token=" + @token)
   elsif @phase == 'vote'
@@ -101,7 +101,7 @@ get '/discuss' do
   @debug = params['debug']
   @user = env.user
   @token = params['token']
-  @progress = loadProgress(@token) if @token
+  loadProgress(@token) if @token
 
   # not needed for this form but required for other forms
   @pmcs = []
@@ -121,7 +121,7 @@ get '/vote' do
   @debug = params['debug']
   @user = env.user
   @token = params['token']
-  @progress = loadProgress(@token) if @token
+  loadProgress(@token) if @token
 
   # not needed for this form but required for other forms
   @pmcs = []

-- 
To stop receiving notification emails like this one, please contact
clr@apache.org.

Mime
View raw message