From 2e9abd8a52647479bfeaa9c5202c5be693d00c82 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 28 Jul 2015 11:39:03 -0400 Subject: [PATCH] Bug 14610 - Update circ rules --- Koha/Schema/Result/Issuingrule.pm | 18 +++++++++++++++- admin/smart-rules.pl | 2 + installer/data/mysql/atomicupdate/bug_14610.sql | 2 + .../prog/en/modules/admin/smart-rules.tt | 21 ++++++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm index 438c23b..d8b4111 100644 --- a/Koha/Schema/Result/Issuingrule.pm +++ b/Koha/Schema/Result/Issuingrule.pm @@ -174,6 +174,13 @@ __PACKAGE__->table("issuingrules"); is_nullable: 0 size: 1 +=head2 article_requests + + data_type: 'enum' + default_value: 'no' + extra: {list => ["no","yes","bib_only","item_only"]} + is_nullable: 0 + =cut __PACKAGE__->add_columns( @@ -234,6 +241,13 @@ __PACKAGE__->add_columns( { data_type => "tinyint", default_value => 0, is_nullable => 0 }, "opacitemholds", { data_type => "char", default_value => "N", is_nullable => 0, size => 1 }, + "article_requests", + { + data_type => "enum", + default_value => "no", + extra => { list => ["no", "yes", "bib_only", "item_only"] }, + is_nullable => 0, + }, ); =head1 PRIMARY KEY @@ -253,8 +267,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("branchcode", "categorycode", "itemtype"); -# Created by DBIx::Class::Schema::Loader v0.07040 @ 2014-12-19 07:00:40 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CE8yuYC5QgPHI2GOjiT28w +# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-07-28 11:06:46 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7NYRxVqqaOboCYmWvs1cyw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl index 9ef6ef6..49fc2db 100755 --- a/admin/smart-rules.pl +++ b/admin/smart-rules.pl @@ -127,6 +127,7 @@ elsif ($op eq 'add') { my $hardduedatecompare = $input->param('hardduedatecompare'); my $rentaldiscount = $input->param('rentaldiscount'); my $opacitemholds = $input->param('opacitemholds') || 0; + my $article_requests = $input->param('article_requests') || 'no'; my $overduefinescap = $input->param('overduefinescap') || undef; $debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty"; @@ -155,6 +156,7 @@ elsif ($op eq 'add') { rentaldiscount => $rentaldiscount, onshelfholds => $onshelfholds, opacitemholds => $opacitemholds, + article_requests => $article_requests, overduefinescap => $overduefinescap, }; diff --git a/installer/data/mysql/atomicupdate/bug_14610.sql b/installer/data/mysql/atomicupdate/bug_14610.sql index ddfbd6a..0611768 100644 --- a/installer/data/mysql/atomicupdate/bug_14610.sql +++ b/installer/data/mysql/atomicupdate/bug_14610.sql @@ -28,3 +28,5 @@ ALTER TABLE `article_requests` ADD FOREIGN KEY ( `biblionumber` ) REFERENCES ALTER TABLE `article_requests` ADD FOREIGN KEY ( `itemnumber` ) REFERENCES `koha_kohaqa`.`items` ( `itemnumber` ) ON DELETE SET NULL ON UPDATE CASCADE ; + +ALTER TABLE `issuingrules` ADD `article_requests` ENUM( 'no', 'yes', 'bib_only', 'item_only' ) NOT NULL DEFAULT 'no'; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 84ffcd8..3e234fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -158,6 +158,7 @@ for="tobranch">Clone these rules to:   @@ -222,6 +223,17 @@ for="tobranch">Clone these rules to: Edit @@ -292,6 +304,14 @@ for="tobranch">Clone these rules to: Force + + + @@ -320,6 +340,7 @@ for="tobranch">Clone these rules to:   -- 1.7.2.5