X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Fitemtypes.pl;h=87af801ce9d51f9cdba7b9d31f77737c25605802;hb=eccf1fa5eb5873c12fe91f29f77f51eab0fb9b44;hp=345e172299370b2baf6b0388d3859606da635274;hpb=7da895cda7a1e3afba3b6de55482d19e8e8bd9aa;p=koha_fer diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl index 345e172299..87af801ce9 100755 --- a/admin/itemtypes.pl +++ b/admin/itemtypes.pl @@ -13,9 +13,9 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. =head1 admin/itemtypes.pl @@ -41,6 +41,7 @@ written 20/02/2002 by paul.poulain@free.fr =cut use strict; +#use warnings; FIXME - Bug 2505 use CGI; use List::Util qw/min/; @@ -68,7 +69,6 @@ my $input = new CGI; my $searchfield = $input->param('description'); my $script_name = "/cgi-bin/koha/admin/itemtypes.pl"; my $itemtype = $input->param('itemtype'); -my $pagesize = 10; my $op = $input->param('op'); $searchfield =~ s/\,//g; my ( $template, $borrowernumber, $cookie ) = get_template_and_user( @@ -77,7 +77,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => { parameters => 1 }, + flagsrequired => { parameters => 'parameters_remaining_permissions' }, debug => 1, } ); @@ -91,6 +91,9 @@ if ($op) { my $dbh = C4::Context->dbh; +my $sip_media_type = $input->param('sip_media_type'); +undef($sip_media_type) if defined($sip_media_type) and $sip_media_type =~ /^\s*$/; + ################## ADD_FORM ################################## # called by default. Used to create form to add or modify a record if ( $op eq 'add_form' ) { @@ -112,14 +115,16 @@ if ( $op eq 'add_form' ) { $template->param( itemtype => $itemtype, description => $data->{'description'}, - renewalsallowed => $data->{'renewalsallowed'}, rentalcharge => sprintf( "%.2f", $data->{'rentalcharge'} ), notforloan => $data->{'notforloan'}, imageurl => $data->{'imageurl'}, template => C4::Context->preference('template'), summary => $data->{summary}, + checkinmsg => $data->{'checkinmsg'}, + checkinmsgtype => $data->{'checkinmsgtype'}, imagesets => $imagesets, remote_image => $remote_image, + sip_media_type => $data->{sip_media_type}, ); # END $OP eq ADD_FORM @@ -138,17 +143,18 @@ elsif ( $op eq 'add_validate' ) { my $query2 = ' UPDATE itemtypes SET description = ? - , renewalsallowed = ? , rentalcharge = ? , notforloan = ? , imageurl = ? , summary = ? + , checkinmsg = ? + , checkinmsgtype = ? + , sip_media_type = ? WHERE itemtype = ? '; $sth = $dbh->prepare($query2); $sth->execute( $input->param('description'), - $input->param('renewalsallowed'), $input->param('rentalcharge'), ( $input->param('notforloan') ? 1 : 0 ), ( @@ -159,28 +165,33 @@ elsif ( $op eq 'add_validate' ) { ) ), $input->param('summary'), + $input->param('checkinmsg'), + $input->param('checkinmsgtype'), + $sip_media_type, $input->param('itemtype') ); } else { # add a new itemtype & not modif an old my $query = " INSERT INTO itemtypes - (itemtype,description,renewalsallowed,rentalcharge, notforloan, imageurl,summary) + (itemtype,description,rentalcharge, notforloan, imageurl, summary, checkinmsg, checkinmsgtype, sip_media_type) VALUES - (?,?,?,?,?,?,?); + (?,?,?,?,?,?,?,?,?); "; my $sth = $dbh->prepare($query); my $image = $input->param('image'); $sth->execute( $input->param('itemtype'), $input->param('description'), - $input->param('renewalsallowed'), $input->param('rentalcharge'), $input->param('notforloan') ? 1 : 0, $image eq 'removeImage' ? '' : $image eq 'remoteImage' ? $input->param('remoteImage') : $image, $input->param('summary'), + $input->param('checkinmsg'), + $input->param('checkinmsgtype'), + $sip_media_type, ); } @@ -192,26 +203,27 @@ elsif ( $op eq 'add_validate' ) { # called by default form, used to confirm deletion of data in DB } elsif ( $op eq 'delete_confirm' ) { - # Check both categoryitem and biblioitems, see Bug 199 - my $total = 0; - for my $table ('biblioitems') { - my $sth = - $dbh->prepare( - "select count(*) as total from $table where itemtype=?"); - $sth->execute($itemtype); - $total += $sth->fetchrow_hashref->{total}; - } + # Check both items and biblioitems + my $sth = $dbh->prepare(' + SELECT COUNT(*) AS total FROM ( + SELECT itemtype AS t FROM biblioitems + UNION ALL + SELECT itype AS t FROM items + ) AS tmp + WHERE tmp.t=? + '); + $sth->execute($itemtype); + my $total = $sth->fetchrow_hashref->{'total'}; my $sth = $dbh->prepare( -"select itemtype,description,renewalsallowed,rentalcharge from itemtypes where itemtype=?" +"select itemtype,description,rentalcharge from itemtypes where itemtype=?" ); $sth->execute($itemtype); my $data = $sth->fetchrow_hashref; $template->param( itemtype => $itemtype, description => $data->{description}, - renewalsallowed => $data->{renewalsallowed}, rentalcharge => sprintf( "%.2f", $data->{rentalcharge} ), imageurl => $data->{imageurl}, total => $total @@ -234,16 +246,8 @@ elsif ( $op eq 'delete_confirmed' ) { } else { # DEFAULT my ($results) = StringSearch( $searchfield, 'web' ); - my $page = $input->param('page') || 1; - my $first = ( $page - 1 ) * $pagesize; - - # if we are on the last page, the number of the last word to display - # must not exceed the length of the results array - my $last = min( $first + $pagesize - 1, scalar @{$results} - 1, ); - my $toggle = 0; my @loop; - foreach my $itemtype ( @{$results}[ $first .. $last ] ) { - $itemtype->{toggle} = ($toggle++ % 2) ? 0 : 1 ; + foreach my $itemtype ( @{$results} ) { $itemtype->{imageurl} = getitemtypeimagelocation( 'intranet', $itemtype->{imageurl} ); $itemtype->{rentalcharge} = sprintf( '%.2f', $itemtype->{rentalcharge} ); push( @loop, $itemtype ); @@ -251,10 +255,6 @@ else { # DEFAULT $template->param( loop => \@loop, - pagination_bar => pagination_bar( - $script_name, getnbpages( scalar @{$results}, $pagesize ), - $page, 'page' - ) ); } #---- END $OP eq DEFAULT