[whimsy] 01/02: rough in task list

[ru...@apache.org]

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

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

commit ba0de3cddacd9eb773f0a46c4ffdb3c7bf0d0006
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Sep 6 15:36:05 2016 -0400

    rough in task list
---
 www/secmail/server.rb                  | 3 ++-
 www/secmail/views/actions/icla.json.rb | 4 ++--
 www/secmail/views/forms/icla.js.rb     | 2 +-
 www/secmail/views/tasklist.html.rb     | 4 ++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/www/secmail/server.rb b/www/secmail/server.rb
index 5d4ddcf..611cbce 100644
--- a/www/secmail/server.rb
+++ b/www/secmail/server.rb
@@ -50,7 +50,8 @@ end
 
 # task lists
 post '/tasklist/:file' do
-  @tasklist = JSON.parse(_json :"actions/#{params[:file]}")['tasklist']
+  dryrun = _json(:"actions/#{params[:file]}")
+  @tasklist = JSON.parse(dryrun)['tasklist']
   _html :tasklist
 end
 
diff --git a/www/secmail/views/actions/icla.json.rb b/www/secmail/views/actions/icla.json.rb
index 8d3a065..a7d504d 100644
--- a/www/secmail/views/actions/icla.json.rb
+++ b/www/secmail/views/actions/icla.json.rb
@@ -6,13 +6,13 @@ message = Mailbox.find(@message)
 iclas = ASF::SVN['private/documents/iclas']
 
 # write attachment (+ signature, if present) to the documents/iclas directory
-task "svn commit #{@filename}" do
+_task "svn commit #{@filename}" do
   svn_reset iclas
   dest = message.write_svn(iclas, @filename, @selected, @signature)
 end
 
 # insert line into iclas.txt
-task "svn commit iclas.txt" do
+_task "svn commit iclas.txt" do
   # construct line to be inserted
   insert = [
     'notinavail',
diff --git a/www/secmail/views/forms/icla.js.rb b/www/secmail/views/forms/icla.js.rb
index 1b06431..4f5c647 100644
--- a/www/secmail/views/forms/icla.js.rb
+++ b/www/secmail/views/forms/icla.js.rb
@@ -8,7 +8,7 @@ class ICLA < React
   def render
     _h4 'ICLA'
 
-    _form action: '../../actions/icla', method: 'post', onSubmit: self.file do
+    _form action: '../../tasklist/icla', method: 'post', onSubmit: self.file do
       _table.form do
         _tr do
           _th 'Real Name'
diff --git a/www/secmail/views/tasklist.html.rb b/www/secmail/views/tasklist.html.rb
new file mode 100644
index 0000000..fe4c186
--- /dev/null
+++ b/www/secmail/views/tasklist.html.rb
@@ -0,0 +1,4 @@
+_html do
+  _h1 'tasklist'
+  _pre @tasklist.inspect
+end

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.