From 8338ac461d0c35e70ce8853a7677d23d046cce62 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 19 Jun 2017 19:47:52 +0000 Subject: [PATCH] Bug 12365 - Notes for rules Lee Jamison rescued this patch. It is a clean re-build of attachments 61865 and 63902 to fix the merge conflict introduced during application of both attachments. To test: Follow test plan in Comment 2 Signed-off-by: Mark Tompsett Signed-off-by: macon lauren KohaCon17 --- Koha/Schema/Result/Issuingrule.pm | 8 ++++++++ admin/smart-rules.pl | 2 ++ .../bug_12365_-_add_note_column_to_issuingrules.perl | 9 +++++++++ installer/data/mysql/kohastructure.sql | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 5 +++++ 5 files changed, 25 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/bug_12365_-_add_note_column_to_issuingrules.perl diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm index 0ea74ca..924835a 100644 --- a/Koha/Schema/Result/Issuingrule.pm +++ b/Koha/Schema/Result/Issuingrule.pm @@ -215,6 +215,12 @@ __PACKAGE__->table("issuingrules"); extra: {list => ["no","yes","bib_only","item_only"]} is_nullable: 0 +=head2 note + + data_type: 'varchar' + is_nullable: 1 + size: 100 + =cut __PACKAGE__->add_columns( @@ -294,6 +300,8 @@ __PACKAGE__->add_columns( extra => { list => ["no", "yes", "bib_only", "item_only"] }, is_nullable => 0, }, + "note", + { data_type => "varchar", is_nullable => 1, size => 100 }, ); =head1 PRIMARY KEY diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl index 6a55b7b..aa9e327 100755 --- a/admin/smart-rules.pl +++ b/admin/smart-rules.pl @@ -160,6 +160,7 @@ elsif ($op eq 'add') { my $article_requests = $input->param('article_requests') || 'no'; my $overduefinescap = $input->param('overduefinescap') || undef; my $cap_fine_to_replacement_price = $input->param('cap_fine_to_replacement_price') eq 'on'; + my $note = $input->param('note'); $debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty, $maxonsiteissueqty, $cap_fine_to_replacement_price"; my $params = { @@ -192,6 +193,7 @@ elsif ($op eq 'add') { overduefinescap => $overduefinescap, cap_fine_to_replacement_price => $cap_fine_to_replacement_price, article_requests => $article_requests, + note => $note, }; my $issuingrule = Koha::IssuingRules->find({categorycode => $bor, itemtype => $itemtype, branchcode => $br}); diff --git a/installer/data/mysql/atomicupdate/bug_12365_-_add_note_column_to_issuingrules.perl b/installer/data/mysql/atomicupdate/bug_12365_-_add_note_column_to_issuingrules.perl new file mode 100644 index 0000000..6b4d671 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_12365_-_add_note_column_to_issuingrules.perl @@ -0,0 +1,9 @@ +$DBversion = 'XXX'; +if( CheckVersion( $DBversion ) ) { + unless( column_exists( 'issuingrules', 'note' ) ) { + $dbh->do(q|ALTER TABLE issuingrules ADD note varchar(100) default NULL AFTER article_requests|); + } + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 12365: Add column issuingrules.note)\n"; +} diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e227125..87f49f1 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -886,6 +886,7 @@ CREATE TABLE `issuingrules` ( -- circulation and fine rules onshelfholds tinyint(1) NOT NULL default 0, -- allow holds for items that are on shelf opacitemholds char(1) NOT NULL default 'N', -- allow opac users to place specific items on hold article_requests enum('no','yes','bib_only','item_only') NOT NULL DEFAULT 'no', -- allow article requests to be placed, + `note` varchar(100) default NULL, -- description of rule, reason for setting rule PRIMARY KEY (`branchcode`,`categorycode`,`itemtype`), KEY `categorycode` (`categorycode`), KEY `itemtype` (`itemtype`) 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 5bc44ba..e3b92da 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 @@ -194,6 +194,7 @@ $(document).ready(function() { Item level holds Article requests Rental discount (%) + Note Actions @@ -298,6 +299,7 @@ $(document).ready(function() { [% END %] [% rule.rentaldiscount %] + [% rule.note %] Edit Delete @@ -397,6 +399,7 @@ $(document).ready(function() { + @@ -434,6 +437,8 @@ $(document).ready(function() { Article requests Rental discount (%)   + Note +   -- 2.1.4