9dca7096c8
This patch adds a new column to item types. Text in this column is
displayed as a warning when an item of the given type is checked in.
The type of message can also be chosen, affecting how the message is
displayed.
Use case: Items that are on inter-library loan can have a separate
item type, and when items of this type are checked in a message
saying something like "ILL! Remember to return it to the owning
library!" can be displayed.
To test:
- Apply the patch
- Go to Home > Administration > Item types administration
- Check that there is a new column, called "Check in message"
- Edit an item type and add a check in message
- Check that the check in message you added is displayed in the table
- Check in an item with an item type that has a check in message
- Check that the message is displayed
- Repeat the steps above, but select "Alert" instead of the default
"Message" as the "Check in message type". Check that the message
is displayed in a yellow alert box, not a blue message box.
- Check in an item with an item type that does *not* have a check
in message, and make sure no false messages are displayed
- Create a new item type from scratch and check that it works
the way it is supposed to
- Run the tests in t/ItemType.t, which are updated by this patch
This patch also removes backticks around column names in the
itemtypes table in installer/data/mysql/kohastructure.sql
UPDATE 2013-07-22
- Rebased on current master (no changes)
- Added "AFTER summary" to the SQL statement in updatedatabase.pl
- Added another placeholder on line 170 of admin/itemtypes.pl
Thanks Katrin!
UPDATE 2013-07-29
- Make this message independent of all other messages - thanks Owen!
- Make it possible to choose the type of message ("alert" or
"message")
Sponsored-by: Kultur i Halland - Regionbibliotek
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed some tabs to make the QA script happy.
All old and new tests pass.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
107 lines
2.9 KiB
Perl
Executable file
107 lines
2.9 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
use strict;
|
|
use warnings;
|
|
use DBI;
|
|
use Test::More tests => 26;
|
|
use Test::MockModule;
|
|
|
|
BEGIN {
|
|
use_ok('C4::ItemType');
|
|
}
|
|
|
|
my $module = new Test::MockModule('C4::Context');
|
|
$module->mock(
|
|
'_new_dbh',
|
|
sub {
|
|
my $dbh = DBI->connect( 'DBI:Mock:', '', '' )
|
|
|| die "Cannot create handle: $DBI::errstr\n";
|
|
return $dbh;
|
|
}
|
|
);
|
|
|
|
# Mock data
|
|
my $itemtypes = [
|
|
[
|
|
'itemtype', 'description', 'rentalcharge', 'notforloan',
|
|
'imageurl', 'summary', 'checkinmsg'
|
|
],
|
|
[ 'BK', 'Books', 0, 0, '', '', 'foo' ],
|
|
[ 'CD', 'CDRom', 0, 0, '', '', 'bar' ]
|
|
];
|
|
|
|
my $itemtypes_empty = [
|
|
[
|
|
'itemtype', 'description', 'rentalcharge', 'notforloan',
|
|
'imageurl', 'summary', 'checkinmsg'
|
|
],
|
|
];
|
|
|
|
my $dbh = C4::Context->dbh();
|
|
$dbh->{mock_add_resultset} = $itemtypes_empty;
|
|
|
|
my @itemtypes = C4::ItemType->all();
|
|
is( @itemtypes, 0, 'Testing all itemtypes is empty' );
|
|
|
|
# This should run exactly one query so we can test
|
|
my $history = $dbh->{mock_all_history};
|
|
is( scalar( @{$history} ), 1, 'Correct number of statements executed' );
|
|
|
|
# Now lets mock some data
|
|
$dbh->{mock_add_resultset} = $itemtypes;
|
|
|
|
@itemtypes = C4::ItemType->all();
|
|
|
|
$history = $dbh->{mock_all_history};
|
|
is( scalar( @{$history} ), 2, 'Correct number of statements executed' );
|
|
|
|
is( @itemtypes, 2, 'ItemType->all should return an array with 2 elements' );
|
|
|
|
is( $itemtypes[0]->fish, undef, 'Calling a bad descriptor gives undef' );
|
|
|
|
is( $itemtypes[0]->itemtype, 'BK', 'First itemtype is bk' );
|
|
|
|
is( $itemtypes[1]->itemtype, 'CD', 'second itemtype is cd' );
|
|
|
|
is( $itemtypes[0]->description, 'Books', 'First description is books' );
|
|
|
|
is( $itemtypes[1]->description, 'CDRom', 'second description is CDRom' );
|
|
|
|
is( $itemtypes[0]->rentalcharge, '0', 'first rental charge is 0' );
|
|
|
|
is( $itemtypes[1]->rentalcharge, '0', 'second rental charge is 0' );
|
|
|
|
is( $itemtypes[0]->notforloan, '0', 'first not for loan is 0' );
|
|
|
|
is( $itemtypes[1]->notforloan, '0', 'second not for loan is 0' );
|
|
|
|
is( $itemtypes[0]->imageurl, '', 'first imageurl is undef' );
|
|
|
|
is( $itemtypes[1]->imageurl, '', 'second imageurl is undef' );
|
|
|
|
is( $itemtypes[0]->checkinmsg, 'foo', 'first checkinmsg is foo' );
|
|
|
|
is( $itemtypes[1]->checkinmsg, 'bar', 'second checkinmsg is bar' );
|
|
|
|
# Mock the data again
|
|
$dbh->{mock_add_resultset} = $itemtypes;
|
|
|
|
# Test get(), which should return one itemtype
|
|
my $itemtype = C4::ItemType->get( 'BK' );
|
|
|
|
$history = $dbh->{mock_all_history};
|
|
is( scalar( @{$history} ), 3, 'Correct number of statements executed' );
|
|
|
|
is( $itemtype->fish, undef, 'Calling a bad descriptor gives undef' );
|
|
|
|
is( $itemtype->itemtype, 'BK', 'itemtype is bk' );
|
|
|
|
is( $itemtype->description, 'Books', 'description is books' );
|
|
|
|
is( $itemtype->rentalcharge, '0', 'rental charge is 0' );
|
|
|
|
is( $itemtype->notforloan, '0', 'not for loan is 0' );
|
|
|
|
is( $itemtype->imageurl, '', ' not for loan is undef' );
|
|
|
|
is( $itemtype->checkinmsg, 'foo', 'checkinmsg is foo' );
|