default to a session cookie instead of setting an explicit timeout, weird timezone...

[freeside.git] / httemplate / edit / process / bulk-part_pkg-fcc.html

diff --git a/httemplate/edit/process/bulk-part_pkg-fcc.html b/httemplate/edit/process/bulk-part_pkg-fcc.html
index 17579aa..d060a24 100644 (file)
--- a/httemplate/edit/process/bulk-part_pkg-fcc.html
+++ b/httemplate/edit/process/bulk-part_pkg-fcc.html
@@ -17,12 +17,13 @@
 %   }
 <% $cgi->redirect($fsurl.'browse/part_pkg-fcc.html?redirect='.$session) %>
 % } else {
-<% $cgi->redirect($fsurl.'browse/part_pkg-fcc.html?classnum='.$classnum) %>
+<% $cgi->redirect($dest) %>
 % }
 <%init>
 my $curuser = $FS::CurrentUser::CurrentUser;
-die "access denied"
-  unless $curuser->access_right('Bulk edit package definitions');
+my $edit_acl = $curuser->access_right('Edit FCC report configuration');
+my $global_edit_acl = $curuser->access_right('Edit FCC report configuration for all agents');
+die "access denied" unless $edit_acl or $global_edit_acl;
 
 # non-atomic; report errors but allow successful changes to go through
 # not that I even know how you'd get an error doing this
@@ -37,6 +38,14 @@ foreach my $param ($cgi->param) {
   $error{$pkgpart} = $error if $error;
 }
 
-my $classnum = $cgi->param('classnum');
+my $dest = $fsurl.'browse/part_pkg-fcc.html?';
+foreach (qw(classnum maxrecords offset)) {
+  if ( $cgi->param($_) =~ /^(\d+)$/ ) {
+    $dest .= "$_=$1;";
+  }
+}
 
+if ( $cgi->param('jump') =~ /^pkgpart(\d+)$/ ) {
+  $dest .= "#$1";
+}
 </%init>