This is an automated email from the ASF dual-hosted git repository.
sebb 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 9874dfa Show target directory
9874dfa is described below
commit 9874dfa0f3399aadbd0fe2ec099f4c5581a95f40
Author: Sebb <[email protected]>
AuthorDate: Sat Nov 30 01:57:31 2019 +0000
Show target directory
---
www/secretary/workbench/views/actions/icla2.json.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/www/secretary/workbench/views/actions/icla2.json.rb
b/www/secretary/workbench/views/actions/icla2.json.rb
index a25b4d8..e6a180b 100644
--- a/www/secretary/workbench/views/actions/icla2.json.rb
+++ b/www/secretary/workbench/views/actions/icla2.json.rb
@@ -26,6 +26,7 @@ svndir = ASF::SVN['iclas'].untaint
@filename.untaint if @filename =~ /\A\w[-.\w]*\z/
if not Dir.exist? "#{svndir}/#@filename"
+ # Assumes there is a single matching file
@existing = File.basename(Dir["#{svndir}/#@filename.*"].first)
task "svn mv #@existing #@filename/icla#{File.extname(@existing)}" do
form do
@@ -33,7 +34,7 @@ if not Dir.exist? "#{svndir}/#@filename"
end
complete do |dir|
- # checkout empty officers directory
+ # checkout empty iclas directory
svn 'checkout', '--depth', 'empty',
'https://svn.apache.org/repos/private/documents/iclas', "#{dir}/iclas"
@@ -63,7 +64,7 @@ count = (Dir["#{svndir}/#@filename/*"].
map {|name| name[/.*(\d+)\./, 1] || 1}.map(&:to_i).max || 1) + 1
# write attachment (+ signature, if present) to the documents/iclas directory
-task "svn commit documents/iclas/icla#{count}#{fileext}" do
+task "svn commit documents/iclas/#@filename/icla#{count}#{fileext}" do
form do
_input value: @selected, name: 'selected'
