From a3f7511c9762064b3784289d34fb6225c3e8e2e1 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 5 Jun 2018 23:19:05 +0000 Subject: [PATCH] Bug 17698: [FOLLOW-UP] Rebase and schema update Setting to signed off. --- Koha/Schema/Result/Issue.pm | 11 +++++++++-- .../intranet-tmpl/prog/en/modules/circ/checkout-notes.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/circulation-home.tt | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Koha/Schema/Result/Issue.pm b/Koha/Schema/Result/Issue.pm index 7fb084c..c111557 100644 --- a/Koha/Schema/Result/Issue.pm +++ b/Koha/Schema/Result/Issue.pm @@ -112,6 +112,11 @@ __PACKAGE__->table("issues"); datetime_undef_if_invalid: 1 is_nullable: 1 +=head2 noteseen + + data_type: 'integer' + is_nullable: 1 + =cut __PACKAGE__->add_columns( @@ -170,6 +175,8 @@ __PACKAGE__->add_columns( datetime_undef_if_invalid => 1, is_nullable => 1, }, + "noteseen", + { data_type => "integer", is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -241,8 +248,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:skFfce3y1eEx3rSdFaLmPg +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-06-05 23:11:40 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QTDac8miU8pYCJsmIcWhvQ __PACKAGE__->belongs_to( "borrower", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index 7a04453..05533e7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -64,7 +64,7 @@ [% note.item.biblio.title %] - [% note.item.biblio.author %] ([% note.item.barcode %]) [% note.note %] [% note.notedate | $KohaDates %] - [% IF note.patron.title %][% note.patron.title %][% END %][% note.patron.firstname %] [% note.patron.surname %] ([% note.patron.cardnumber %]) + [% IF note.patron.title %][% note.patron.title %] [% END %][% note.patron.firstname %] [% note.patron.surname %] ([% note.patron.cardnumber %]) [% IF ( note.noteseen == 0 ) %] Not seen diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index 4f80a41..56450bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -41,7 +41,7 @@ [% END %] [% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %]
  • - Checkout notes [% IF ( pending_checkout_notes ) %][% pending_checkout_notes %][% END %] + Checkout notes [% IF ( pending_checkout_notes ) %][% pending_checkout_notes %][% END %]
  • [% END %] -- 2.1.4