I’ve updated the patch.
The actions for unsigned and incomplete create menu items ok except I’d like to
have
icla grant ccla nda mem other on one line and then
incomplete unsigned on the next line
diff --git a/www/secretary/workbench/file.cgi b/www/secretary/workbench/file.cgi
index 26a4aa5..0765921 100755
--- a/www/secretary/workbench/file.cgi
+++ b/www/secretary/workbench/file.cgi
@@ -608,6 +608,22 @@ _html do
update_pending params, dest
+ when 'unsigned'
+ @realname ||= @nname
+
+ _h1 "Unsigned for #{@realname}"
+ _.move @source, dest
+
+ update_pending params, dest
+
+ when 'incomplete'
+ @realname ||= @nname
+
+ _h1 "Incomplete for #{@realname}"
+ _.move @source, dest
+
+ update_pending params, dest
+
when 'mem'
@realname ||= @mfname
dest.untaint if dest =~ /^[-.\w]+$/
@@ -856,6 +872,8 @@ _html do
icla: %w( realname email ),
ccla: %w( cemail contact ),
nda: %w( nname nemail nid ),
+ incomplete: %w( nname nemail ),
+ unsigned: %w( nname nemail ),
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
> On Aug 20, 2016, at 9:01 AM, Craig Russell <[email protected]> wrote:
>
> Please review this patch. The intent is to promote unsigned and incomplete to
> “first class” actions.
>
> 1. Allow secretary to fill the form for name, email address, pmc, and podling.
> 2. File action will move the document to deadletter/incomplete
> 3. Commit action will commit the move and send email to the submitter, the
> pmc, and the podling with a standard message.
>
> I’ve updated the application files that I can find. Now I need to find the
> other places and figure out how to test this thing locally. (Thanks Sam for
> your help so far).
>
> Thanks,
>
> Craig
>
> <unsigned.txt>
> Craig L Russell
> [email protected]
>
>
Craig L Russell
Architect
[email protected]
P.S. A good JDO? O, Gasp!
