[whimsy] branch master updated: Add source email information to incomplete/unsigned emails

[cl...@apache.org]

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  a3ae1a7   Add source email information to incomplete/unsigned emails
       new  813421c   Merge branch 'master' of github.com:apache/whimsy
a3ae1a7 is described below

commit a3ae1a7ae57975b961e5c35074852580f817712f
Author: Craig L Russell <cr...@oracle.com>
AuthorDate: Fri Aug 26 10:47:26 2016 -0700

    Add source email information to incomplete/unsigned emails
---
 www/secretary/workbench/file.cgi | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/www/secretary/workbench/file.cgi b/www/secretary/workbench/file.cgi
index f880e71..a37160b 100755
--- a/www/secretary/workbench/file.cgi
+++ b/www/secretary/workbench/file.cgi
@@ -611,22 +611,23 @@ _html do
       update_pending params, dest
 
     when 'incomplete'
+      dest = "#{RECEIVED}/deadletter/incomplete/#{File.basename(@source)}"
+
       Dir.chdir(RECEIVED) do
         @realname ||= @iname
-
         _h1 "Incomplete document received from #{@iname}"
-        _.move @source, 'deadletter/incomplete'
-
+        _.move @source, dest
       end
 
-      update_pending params, 'deadletter/incomplete'
+      update_pending params, dest
 
     when 'unsigned'
-      Dir.chdir(RECEIVED) do
-        @realname ||= @nname
+      dest = "#{RECEIVED}/deadletter/unsigned/#{File.basename(@source)}"
 
+      Dir.chdir(RECEIVED) do
+        @realname ||= @uname
         _h1 "Unsigned document received from #{@uname}"
-        _.move @source, 'deadletter/unsigned'
+        _.move @source, dest
       end
 
       update_pending params, dest

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