Commit 728c0ec6b6a229521f9326ff486ab230fdb0a6d3:
More fixes
git-svn-id:
https://svn.apache.org/repos/infra/infrastructure/trunk/projects/whimsy@819503
90ea9780-b833-de11-8433-001ec94261de
Branch: refs/heads/master
Author: Sam Ruby <[email protected]>
Committer: Sam Ruby <[email protected]>
Pusher: rubys <[email protected]>
------------------------------------------------------------
www/secretary/workbench/README | +++
www/secretary/workbench/file.cgi | ++++ ----
www/secretary/workbench/worklist.js | + -
------------------------------------------------------------
13 changes: 8 additions, 5 deletions.
------------------------------------------------------------
diff --git a/www/secretary/workbench/README b/www/secretary/workbench/README
index 8e0341b..89db1ff 100644
--- a/www/secretary/workbench/README
+++ b/www/secretary/workbench/README
@@ -22,3 +22,6 @@ General design of the tool:
*) ccla.erb, grant.erb, icla.erb, mem.erb, and nda.erb are mail templates
of confirmation replies sent back when the document is processed.
+
+*) The tool assumes that the url /members/received is a symlink to a checkout
+ of https://svn.apache.org/repos/private/documents/received
diff --git a/www/secretary/workbench/file.cgi b/www/secretary/workbench/file.cgi
index 0145ee8..2bfdabf 100755
--- a/www/secretary/workbench/file.cgi
+++ b/www/secretary/workbench/file.cgi
@@ -374,7 +374,7 @@ _json do
elsif @cmd == 'icla.txt issues'
_html check
elsif @cmd =~ /email (.*)/
- _html! email $1, @message
+ _html email $1, @message
elsif @cmd =~ /svn commit/ and committable.include? @file
message, file = @message, @file
_html html_fragment {
@@ -748,7 +748,7 @@ _html do
_pre "svn update #{DOCUMENTS}", class: 'todo'
_h3 'icla.txt issues', class: 'todo'
ajax = true
- cleanup = Dir["#{DOCUMENTS}/received/*"].map(&:untaint).
+ cleanup = Dir["#{DOCUMENTS}/members/received/*"].map(&:untaint).
select {|name| File.directory?(name) and Dir["#{name}/*"].empty?}.
reject {|name| name =~ /\/to_\w+$/}
unless cleanup.empty?
@@ -781,9 +781,9 @@ _html do
_li do
_input type: :checkbox, name: "include#{i}", value: file
if %w(jpg).include?(file.split('.').last)
- _img src: "/received/#{@dir}/#{file}"
+ _img src: "/members/received/#{@dir}/#{file}"
else
- _a file, href: "/received/#{@dir}/#{file}"
+ _a file, href: "/members/received/#{@dir}/#{file}"
end
end
end
diff --git a/www/secretary/workbench/worklist.js
b/www/secretary/workbench/worklist.js
index 84b389a..ea1e062 100644
--- a/www/secretary/workbench/worklist.js
+++ b/www/secretary/workbench/worklist.js
@@ -100,7 +100,7 @@ $(document).ready(function() {
parent.frames[1].location.href = 'file.cgi?action=view&dir=' +
encodeURIComponent(link);
} else {
- parent.frames[1].location.href = '/received/' + link;
+ parent.frames[1].location.href = '/members/received/' + link;
}
if (!link.match(/^eFax-\d+\.pdf$/)) {
