[freeside-commits] branch master updated. a2ecb1cf6a6c084c521710f1256da082f70ba9e5

[Ivan]

The branch, master has been updated
       via  a2ecb1cf6a6c084c521710f1256da082f70ba9e5 (commit)
       via  6cca67f8c829f96a51684060f432b105c831af0a (commit)
      from  1aecd5bf33146bf3f374341a3814960ae1d419e8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a2ecb1cf6a6c084c521710f1256da082f70ba9e5
Merge: 1aecd5b 6cca67f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 18 14:41:05 2016 -0700

    Merge branch 'github/pr/57'


commit 6cca67f8c829f96a51684060f432b105c831af0a
Author: Fernando M. Kiernan <fkiernan at id.net.ar>
Date:   Sun Aug 31 22:03:00 2014 -0300

    - Fix delete upload target page.

diff --git a/httemplate/misc/delete-ftp_target.html b/httemplate/misc/delete-upload_target.html
similarity index 71%
rename from httemplate/misc/delete-ftp_target.html
rename to httemplate/misc/delete-upload_target.html
index c8bd297..2626e1d 100644
--- a/httemplate/misc/delete-ftp_target.html
+++ b/httemplate/misc/delete-upload_target.html
@@ -1,7 +1,7 @@
 % if ( $error ) {
 %   errorpage($error);
 % } else {
-<% $cgi->redirect("${p}browse/ftp_target.html") %>
+<% $cgi->redirect("${p}browse/upload_target.html") %>
 % }
 <%init>
 
@@ -12,7 +12,7 @@ my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ || die "Illegal targetnum";
 my $targetnum = $1;
 
-my $target = qsearchs('ftp_target',{'targetnum'=>$targetnum});
+my $target = qsearchs('upload_target',{'targetnum'=>$targetnum});
 my $error = $target->delete;
 
 </%init>

-----------------------------------------------------------------------

Summary of changes:
 .../misc/{delete-ftp_target.html => delete-upload_target.html}     |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename httemplate/misc/{delete-ftp_target.html => delete-upload_target.html} (71%)