X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_pkg-fcc.html;h=69e7d8f31678315b13b52d7b189295e583e22c96;hp=14dfcba08e71aa22bfbfd32a956c909da779478f;hb=HEAD;hpb=7c370a4579d1ed8b81dba2fb5fae9978b283b49e

diff --git a/httemplate/browse/part_pkg-fcc.html b/httemplate/browse/part_pkg-fcc.html
index 14dfcba08..69e7d8f31 100755
--- a/httemplate/browse/part_pkg-fcc.html
+++ b/httemplate/browse/part_pkg-fcc.html
@@ -7,8 +7,7 @@
   'disableable'           => 1,
   'disabled_statuspos'    => 4,
   'agent_virt'            => 1,
-  'agent_null_right'      => [ $edit, $edit_global ],
-  'agent_null_right_link' => $edit_global,
+  'agent_null_right'      => $edit_global,
   'agent_pos'             => 3,
   'query'                 =>
                             { 'select'    => $select,
@@ -95,8 +94,6 @@ my $select = join(',',
 my $addl_from = 
   FS::Report::FCC_477::join_optionnames(@optionnames);
 
-$cgi->param('classnum', $classnum) if length($classnum);
-
 my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ];
 
 my @header = ( '#', 'Package', 'Comment' );
@@ -183,9 +180,11 @@ if ( $cgi->param('redirect') ) {
 my $html_init = 
   include('/elements/init_overlib.html') .
   include('/elements/input-fcc_options.html', js_only => 1) .
-  include('.style');
+  include('.style') .
+  include('.script');
 
-my $html_form = qq!<FORM ACTION="${p}edit/process/bulk-part_pkg-fcc.html" METHOD="POST">
+my $html_form = qq!<FORM ACTION="${p}edit/process/bulk-part_pkg-fcc.html" METHOD="POST" NAME="bulk-part_pkg-fcc">
+  <INPUT TYPE="hidden" NAME="jump">
   ( show class: !.
   include('/elements/select-pkg_class.html',
             #'curr_value'    => $classnum,
@@ -196,17 +195,20 @@ my $html_form = qq!<FORM ACTION="${p}edit/process/bulk-part_pkg-fcc.html" METHOD
             'disable_empty' => 1,
          ).
   ' )
-  <BR><BR>' .
-  qq!<SCRIPT TYPE="text/javascript">
-  function filter_change() {
-    window.location = '! . $cgi->self_url . qq!?classnum='
-      + document.getElementById('classnum').value;
-  }
-  </SCRIPT>!;
+  <BR><BR>';
+
+# pass the page selection through so we can jump back to the current spot
+if ( $cgi->param('maxrecords') =~ /^(\d+)$/ ) {
+  $html_form .= qq!<INPUT TYPE="hidden" NAME="maxrecords" VALUE="$1">!;
+}
+if ( $cgi->param('offset') =~ /^(\d+)$/ ) {
+  $html_form .= qq!<INPUT TYPE="hidden" NAME="offset" VALUE="$1">!;
+}
 
-my $html_foot = qq!
-  <INPUT TYPE="submit" VALUE="Save changes">
-  </FORM>!;
+# restore this only after creating $html_form
+$cgi->param('classnum', $classnum) if length($classnum);
+
+my $html_foot = '</FORM>';
 
 my @menubar =
   ( 'Package definitions' => $p.'browse/part_pkg.cgi' );
@@ -224,3 +226,17 @@ my @menubar =
   }
 </style>
 </%def>
+<%def .script>
+<script type="text/javascript">
+  function finish_edit_fcc(id) {
+    cClick();
+    document.forms['bulk-part_pkg-fcc']['jump'].value = id;
+    document.forms['bulk-part_pkg-fcc'].submit(); //immediately save/refresh
+  }
+
+  function filter_change() {
+    window.location = '<% $cgi->self_url %>?classnum='
+      + document.getElementById('classnum').value;
+  }
+</script>
+</%def>