X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htdocs%2Fedit%2Fpart_pkg.cgi;h=f7ade88c8a7cbef635bd2504fa1c87845af5d3f5;hp=e7ac2aeb22d37b7fcc2c1a171ccee372fcb4be38;hb=e0da34d97b1463b55a334e8dae10cd55796e2312;hpb=899b323ee2feeaf78afdb40526eb75995fe72cad diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi index e7ac2aeb2..f7ade88c8 100755 --- a/htdocs/edit/part_pkg.cgi +++ b/htdocs/edit/part_pkg.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: part_pkg.cgi,v 1.8 1999-01-19 05:13:39 ivan Exp $ +# $Id: part_pkg.cgi,v 1.9 1999-02-07 09:59:19 ivan Exp $ # # part_pkg.cgi: Add/Edit package (output form) # @@ -13,7 +13,10 @@ # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12 # # $Log: part_pkg.cgi,v $ -# Revision 1.8 1999-01-19 05:13:39 ivan +# Revision 1.9 1999-02-07 09:59:19 ivan +# more mod_perl fixes, and bugfixes Peter Wemm sent via email +# +# Revision 1.8 1999/01/19 05:13:39 ivan # for mod_perl: no more top-level my() variables; use vars instead # also the last s/create/new/; # @@ -42,7 +45,7 @@ use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count ); use CGI; use CGI::Carp qw(fatalsToBrowser); use FS::UID qw(cgisuidsetup); -use FS::Record qw(qsearch qsearchs); +use FS::Record qw(qsearch qsearchs fields); use FS::part_pkg; use FS::part_svc; use FS::pkg_svc; @@ -64,24 +67,36 @@ if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) { } ($query) = $cgi->keywords; +$action = ''; +$part_pkg = ''; +if ( $cgi->param('error') ) { + $part_pkg = new FS::part_pkg ( { + map { $_, scalar($cgi->param($_)) } fields('part_pkg') + } ); +} if ( $cgi->param('clone') ) { $action='Custom Pricing'; my $old_part_pkg = qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } ); - $part_pkg = $old_part_pkg->clone; -} elsif ( $query =~ /^(\d+)$/ ) { - $action='Edit'; - $part_pkg=qsearchs('part_pkg',{'pkgpart'=>$1}); + $part_pkg ||= $old_part_pkg->clone; +} elsif ( $query && $query =~ /^(\d+)$/ ) { + $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1}); } else { - $action='Add'; - $part_pkg = new FS::part_pkg {}; + $part_pkg ||= new FS::part_pkg {}; } +$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add'; $hashref = $part_pkg->hashref; print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar( 'Main Menu' => popurl(2), 'View all packages' => popurl(2). 'browse/part_pkg.cgi', -)), '