You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cl...@apache.org on 2016/08/21 23:00:27 UTC
[whimsy] branch incomplete-unsigned created (now 0045b2b)
This is an automated email from the ASF dual-hosted git repository.
clr pushed a change to branch incomplete-unsigned
in repository https://git-dual.apache.org/repos/asf/whimsy.git.
at 0045b2b Start on incomplete-unsigned actions
This branch includes the following new commits:
new 0045b2b Start on incomplete-unsigned actions
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 01/01: Start on incomplete-unsigned actions
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clr pushed a commit to branch incomplete-unsigned
in repository https://git-dual.apache.org/repos/asf/whimsy.git
commit 0045b2b9cfa05fe50c83c6a74f4492b9f9a8fd88
Author: Craig L Russell <cr...@oracle.com>
AuthorDate: Sun Aug 21 15:59:24 2016 -0700
Start on incomplete-unsigned actions
---
www/secmail/views/forms/incomplete.js.rb | 5 +++
www/secmail/views/forms/unsigned.js.rb | 5 +++
www/secretary/workbench/file.cgi | 27 +++++++++++-
www/secretary/workbench/worklist.cgi | 75 +++++++++++++++++++++++++++++++-
4 files changed, 109 insertions(+), 3 deletions(-)
diff --git a/www/secmail/views/forms/incomplete.js.rb b/www/secmail/views/forms/incomplete.js.rb
new file mode 100644
index 0000000..609de64
--- /dev/null
+++ b/www/secmail/views/forms/incomplete.js.rb
@@ -0,0 +1,5 @@
+class INCOMPLETE < React
+ def render
+ _p 'INCOMPLETE'
+ end
+end
diff --git a/www/secmail/views/forms/unsigned.js.rb b/www/secmail/views/forms/unsigned.js.rb
new file mode 100644
index 0000000..e0e3915
--- /dev/null
+++ b/www/secmail/views/forms/unsigned.js.rb
@@ -0,0 +1,5 @@
+class UNSIGNED < React
+ def render
+ _p 'UNSIGNED'
+ end
+end
diff --git a/www/secretary/workbench/file.cgi b/www/secretary/workbench/file.cgi
index 26a4aa5..cf70e1f 100755
--- a/www/secretary/workbench/file.cgi
+++ b/www/secretary/workbench/file.cgi
@@ -65,7 +65,8 @@ def update_pending fields, dest
# copy email field
fields['email'] ||= fields['gemail'] || fields['cemail'] ||
- fields['nemail'] || fields['memail']
+ fields['nemail'] || fields['memail'] ||
+ fields['iemail'] || fields['uemail']
fields.delete('email') unless fields['email']
# Concatenate the fields to the pending list and write to disk
@@ -357,6 +358,7 @@ _json do
_html send_email $1, @message
elsif @cmd =~ /svn (update|revert -R|cleanup)/ and committable.include? @file
op, file = $1.split(' '), @file
+ op << ['--username', $USER, '--password', $PASSWORD] if $PASSWORD
_html html_fragment {
_.system [ 'svn', *op, file ]
}
@@ -424,7 +426,7 @@ DESTINATION = {
"operations" => "to_operations",
"dup" => "deadletter/dup",
"incomplete" => "deadletter/incomplete",
- "unsigned" => "deadletter/incomplete"
+ "unsigned" => "deadletter/unsigned"
}
line = nil
@@ -608,6 +610,25 @@ _html do
update_pending params, dest
+ when 'incomplete'
+ _.system "whoami"
+ @realname ||= @iname
+ dest = "incomplete"
+
+ _h1 "Incomplete from #{@iname}"
+ _.move @source, dest
+
+ update_pending params, dest
+
+ when 'unsigned'
+ @realname ||= @nname
+ dest = "unsigned"
+
+ _h1 "Unsigned from #{@uname}"
+ _.move @source, dest
+
+ update_pending params, dest
+
when 'mem'
@realname ||= @mfname
dest.untaint if dest =~ /^[-.\w]+$/
@@ -856,6 +877,8 @@ _html do
icla: %w( realname email ),
ccla: %w( cemail contact ),
nda: %w( nname nemail nid ),
+ incomplete: %w( iname iemail ),
+ unsigned: %w( uname uemail ),
mem: %w( memail ),
grant: %w( gname gemail ),
}
diff --git a/www/secretary/workbench/worklist.cgi b/www/secretary/workbench/worklist.cgi
index d873935..7e01e81 100755
--- a/www/secretary/workbench/worklist.cgi
+++ b/www/secretary/workbench/worklist.cgi
@@ -2,7 +2,7 @@
require 'wunderbar'
require 'yaml'
-DOCTYPES = %w{icla grant ccla nda other}
+DOCTYPES = %w{icla grant ccla nda incomplete unsigned other}
_html do
_head_ do
@@ -75,6 +75,10 @@ _html do
message = "Membership Application from #{pending['realname']}"
elsif pending['doctype'] == 'nda'
message = "NDA for #{pending['realname']}"
+ elsif pending['doctype'] == 'incomplete'
+ message = "Incomplete for #{pending['nname']}"
+ elsif pending['doctype'] == 'unsigned'
+ message = "Unsigned for #{pending['nname']}"
end
end
end
@@ -207,6 +211,47 @@ _html do
end
end
+ _div_ id: 'incomplete-form' do
+ _table do
+ _tr do
+ _td do
+ _label 'Name', for: 'nname'
+ end
+ _td do
+ _input type: :text, name: 'nname', id: 'nname'
+ end
+ end
+
+ _tr do
+ _td.label 'EMail'
+ _td.input do
+ _input name: 'nemail', id: 'nemail', type: 'email'
+ end
+ end
+ end
+ end
+
+ _div_ id: 'unsigned-form' do
+ _table do
+ _tr do
+ _td do
+ _label 'Name', for: 'nname'
+ end
+ _td do
+ _input type: :text, name: 'nname', id: 'nname'
+ end
+ end
+
+ _tr do
+ _td.label 'EMail'
+ _td.input do
+ _input name: 'nemail', id: 'nemail', type: 'email'
+ end
+ end
+
+ end
+ end
+
_div id: 'mem-form' do
if defined?(MEETING)
received = open("#{MEETING}/memapp-received.txt").read
@@ -454,6 +499,34 @@ _html do
end
end
end
+ _table id: 'incomplete2-form' do
+ _tr do
+ _td.label 'PMC'
+ _td.input do
+ _input name: 'cpmc', id: 'cpmc', type: 'text'
+ end
+ end
+ _tr do
+ _td.label 'Podling'
+ _td.input do
+ _input name: 'cpodling', id: 'cpodling', type: 'text'
+ end
+ end
+ end
+ _table id: 'unsigned2-form' do
+ _tr do
+ _td.label 'PMC'
+ _td.input do
+ _input name: 'cpmc', id: 'cpmc', type: 'text'
+ end
+ end
+ _tr do
+ _td.label 'Podling'
+ _td.input do
+ _input name: 'cpodling', id: 'cpodling', type: 'text'
+ end
+ end
+ end
end
end
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.