[interchange] Respect custom BACKUP_DIRECTORY in admin table downloads

Jon Jensen <[email protected]> Fri, 29 Apr 2016 03:03:29 +0000
Newsgroups gmane.comp.web.interchange.cvs
Message-ID <[email protected]>
commit 0a2c666876fa4e5ce3a6322733005a92fc1dd643
Author: Jon Jensen <[email protected]>
Date:   Thu Mar 31 23:42:29 2016 -0600

    Respect custom BACKUP_DIRECTORY in admin table downloads
    
    This matches behavior expected by [export-database].

 dist/lib/UI/pages/admin/dbdownload.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/dist/lib/UI/pages/admin/dbdownload.html b/dist/lib/UI/pages/admin/dbdownload.html
index 2f16d11..534d21c 100644
--- a/dist/lib/UI/pages/admin/dbdownload.html
+++ b/dist/lib/UI/pages/admin/dbdownload.html
@@ -31,14 +31,14 @@
 [set mv_deliver][/set]
 
 
-[if file backup/DBDOWNLOAD.xls]
-	[calc] $Scratch->{mv_deliver} .= ' backup/DBDOWNLOAD.xls'; return; [/calc]
+[if type=file term="[var BACKUP_DIRECTORY]/DBDOWNLOAD.xls"]
+	[calc] $Scratch->{mv_deliver} .= ' ' . $Tag->var('BACKUP_DIRECTORY') . '/DBDOWNLOAD.xls'; return; [/calc]
 	[page href="ui/backup/DBDOWNLOAD.xls"
 	      add_dot_html=0
 			form="
-				mv_data_file=backup/DBDOWNLOAD.xls
+				mv_data_file=[var BACKUP_DIRECTORY]/DBDOWNLOAD.xls
 				mv_todo=deliver
-			"][L]Download XLS file[/L] ([file-info name="backup/DBDOWNLOAD.xls" date=1], [file-info name="backup/DBDOWNLOAD.xls" size=1] bytes)</A><BR>
+			"][L]Download XLS file[/L] ([file-info name="[var BACKUP_DIRECTORY]/DBDOWNLOAD.xls" date=1], [file-info name="[var BACKUP_DIRECTORY]/DBDOWNLOAD.xls" size=1] bytes)</a><br>
 [/if]
 
 [if scratch ui_error]