Bugzilla – Attachment 46101 Details for
Bug 11879
Add a new field to patron record: main contact method
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11879 - Update BDIx schema and show main contact method in moremember.pl
Bug-11879---Update-BDIx-schema-and-show-main-conta.patch (text/plain), 33.12 KB, created by
Bouzid Fergani
on 2015-12-30 20:43:14 UTC
(
hide
)
Description:
Bug 11879 - Update BDIx schema and show main contact method in moremember.pl
Filename:
MIME Type:
Creator:
Bouzid Fergani
Created:
2015-12-30 20:43:14 UTC
Size:
33.12 KB
patch
obsolete
>From 60bdd818e6b8f028fe3dfcf8b30a975077e6f76c Mon Sep 17 00:00:00 2001 >From: Bouzid Fergani <bouzid.fergani@inlibro.com> >Date: Wed, 30 Dec 2015 15:39:58 -0500 >Subject: [PATCH] Bug 11879 - Update BDIx schema and show main contact method > in moremember.pl > >--- > Koha/Schema/Result/Accountline.pm | 11 ++++++-- > Koha/Schema/Result/Aqbasket.pm | 6 ++-- > Koha/Schema/Result/Aqorder.pm | 20 +++++++------- > Koha/Schema/Result/Borrower.pm | 28 +++++++++++++++++-- > Koha/Schema/Result/BorrowerModification.pm | 20 ++++++++++++-- > Koha/Schema/Result/Branch.pm | 19 +++++++++++-- > Koha/Schema/Result/Category.pm | 32 +++++++++++----------- > Koha/Schema/Result/ClassSource.pm | 12 ++++++-- > Koha/Schema/Result/Deletedborrower.pm | 20 ++++++++++++-- > Koha/Schema/Result/ImportBatch.pm | 26 +++++++++--------- > Koha/Schema/Result/Issue.pm | 20 ++++++++++++-- > Koha/Schema/Result/Itemtype.pm | 24 +++++++++++++--- > Koha/Schema/Result/Letter.pm | 6 ++-- > Koha/Schema/Result/MessageQueue.pm | 11 ++++++-- > Koha/Schema/Result/OldIssue.pm | 20 ++++++++++++-- > Koha/Schema/Result/Overduerule.pm | 28 +++++++++++++++++-- > Koha/Schema/Result/Patronimage.pm | 12 ++++++-- > Koha/Schema/Result/Session.pm | 8 +++--- > Koha/Schema/Result/Subscription.pm | 24 ++++++++-------- > Koha/Schema/Result/Virtualshelve.pm | 19 +++++++++++-- > Koha/Schema/Result/Z3950server.pm | 12 ++++++-- > .../prog/en/modules/members/moremember.tt | 1 + > members/moremember.pl | 1 + > 23 files changed, 288 insertions(+), 92 deletions(-) > >diff --git a/Koha/Schema/Result/Accountline.pm b/Koha/Schema/Result/Accountline.pm >index e83ef40..eb306dc 100644 >--- a/Koha/Schema/Result/Accountline.pm >+++ b/Koha/Schema/Result/Accountline.pm >@@ -112,6 +112,11 @@ __PACKAGE__->table("accountlines"); > data_type: 'text' > is_nullable: 1 > >+=head2 paymentmode >+ >+ data_type: 'text' >+ is_nullable: 1 >+ > =head2 manager_id > > data_type: 'integer' >@@ -160,6 +165,8 @@ __PACKAGE__->add_columns( > { data_type => "integer", default_value => 0, is_nullable => 0 }, > "note", > { data_type => "text", is_nullable => 1 }, >+ "paymentmode", >+ { data_type => "text", is_nullable => 1 }, > "manager_id", > { data_type => "integer", is_nullable => 1 }, > ); >@@ -214,8 +221,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jUiCeLLPg5228rNEBW0w2g >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FD7tYHHWmTfEUKDNEHNJ4w > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Aqbasket.pm b/Koha/Schema/Result/Aqbasket.pm >index fbf1185..8a8da3b 100644 >--- a/Koha/Schema/Result/Aqbasket.pm >+++ b/Koha/Schema/Result/Aqbasket.pm >@@ -203,7 +203,7 @@ __PACKAGE__->belongs_to( > { > is_deferrable => 1, > join_type => "LEFT", >- on_delete => "RESTRICT", >+ on_delete => "CASCADE", > on_update => "CASCADE", > }, > ); >@@ -274,8 +274,8 @@ Composing rels: L</aqbasketusers> -> borrowernumber > __PACKAGE__->many_to_many("borrowernumbers", "aqbasketusers", "borrowernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pT+YFf9nfD/dmBuE4RNCFw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pHYJoalRN1RqFhm9WD2h+Q > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Aqorder.pm b/Koha/Schema/Result/Aqorder.pm >index f511aeb..e94a330 100644 >--- a/Koha/Schema/Result/Aqorder.pm >+++ b/Koha/Schema/Result/Aqorder.pm >@@ -209,12 +209,6 @@ __PACKAGE__->table("aqorders"); > datetime_undef_if_invalid: 1 > is_nullable: 1 > >-=head2 subscriptionid >- >- data_type: 'integer' >- is_foreign_key: 1 >- is_nullable: 1 >- > =head2 parent_ordernumber > > data_type: 'integer' >@@ -227,6 +221,12 @@ __PACKAGE__->table("aqorders"); > is_nullable: 1 > size: 16 > >+=head2 subscriptionid >+ >+ data_type: 'integer' >+ is_foreign_key: 1 >+ is_nullable: 1 >+ > =cut > > __PACKAGE__->add_columns( >@@ -299,8 +299,6 @@ __PACKAGE__->add_columns( > { data_type => "integer", default_value => 0, is_nullable => 1 }, > "claimed_date", > { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, >- "subscriptionid", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "parent_ordernumber", > { data_type => "integer", is_nullable => 1 }, > "orderstatus", >@@ -310,6 +308,8 @@ __PACKAGE__->add_columns( > is_nullable => 1, > size => 16, > }, >+ "subscriptionid", >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -492,8 +492,8 @@ Composing rels: L</aqorder_users> -> borrowernumber > __PACKAGE__->many_to_many("borrowernumbers", "aqorder_users", "borrowernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-05-14 11:27:15 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BCa/SxerJ+zEh8Pg9Jdkaw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+86LQQVLbkBSA0AQYZz6aw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm >index 1a7673e..ec7631b 100644 >--- a/Koha/Schema/Result/Borrower.pm >+++ b/Koha/Schema/Result/Borrower.pm >@@ -285,6 +285,18 @@ __PACKAGE__->table("borrowers"); > is_nullable: 1 > size: 100 > >+=head2 ethnicity >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 50 >+ >+=head2 ethnotes >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 255 >+ > =head2 sex > > data_type: 'varchar' >@@ -395,6 +407,12 @@ __PACKAGE__->table("borrowers"); > default_value: 1 > is_nullable: 0 > >+=head2 primary_contact_method >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 45 >+ > =cut > > __PACKAGE__->add_columns( >@@ -522,6 +540,10 @@ __PACKAGE__->add_columns( > { data_type => "mediumtext", is_nullable => 1 }, > "relationship", > { data_type => "varchar", is_nullable => 1, size => 100 }, >+ "ethnicity", >+ { data_type => "varchar", is_nullable => 1, size => 50 }, >+ "ethnotes", >+ { data_type => "varchar", is_nullable => 1, size => 255 }, > "sex", > { data_type => "varchar", is_nullable => 1, size => 1 }, > "password", >@@ -560,6 +582,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 50 }, > "privacy", > { data_type => "integer", default_value => 1, is_nullable => 0 }, >+ "primary_contact_method", >+ { data_type => "varchar", is_nullable => 1, size => 45 }, > ); > > =head1 PRIMARY KEY >@@ -1153,8 +1177,8 @@ Composing rels: L</aqorder_users> -> ordernumber > __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-10-21 19:50:05 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QafovaRBnm36nyoyQTGIgQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:q85WYjBNddrsVi2U846zOA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/BorrowerModification.pm b/Koha/Schema/Result/BorrowerModification.pm >index 0e55830..aaf7ddc 100644 >--- a/Koha/Schema/Result/BorrowerModification.pm >+++ b/Koha/Schema/Result/BorrowerModification.pm >@@ -295,6 +295,18 @@ __PACKAGE__->table("borrower_modifications"); > is_nullable: 1 > size: 100 > >+=head2 ethnicity >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 50 >+ >+=head2 ethnotes >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 255 >+ > =head2 sex > > data_type: 'varchar' >@@ -528,6 +540,10 @@ __PACKAGE__->add_columns( > { data_type => "mediumtext", is_nullable => 1 }, > "relationship", > { data_type => "varchar", is_nullable => 1, size => 100 }, >+ "ethnicity", >+ { data_type => "varchar", is_nullable => 1, size => 50 }, >+ "ethnotes", >+ { data_type => "varchar", is_nullable => 1, size => 255 }, > "sex", > { data_type => "varchar", is_nullable => 1, size => 1 }, > "password", >@@ -583,8 +599,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("verification_token", "borrowernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-10-06 10:38:42 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vZ9XjkjQv0q6l2kW3KMsLg >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eZoxdMxDenF69WRgtYNWEA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Branch.pm b/Koha/Schema/Result/Branch.pm >index 106123a..31faaeb 100644 >--- a/Koha/Schema/Result/Branch.pm >+++ b/Koha/Schema/Result/Branch.pm >@@ -457,6 +457,21 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 openinghours >+ >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::Openinghour> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "openinghours", >+ "Koha::Schema::Result::Openinghour", >+ { "foreign.branchcode" => "self.branchcode" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ > =head2 reserves > > Type: has_many >@@ -513,8 +528,8 @@ Composing rels: L</branchrelations> -> categorycode > __PACKAGE__->many_to_many("categorycodes", "branchrelations", "categorycode"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-11-06 15:26:36 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CGNPB/MkGLOihDThj43/4A >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:euU/hMyGHdFeCpLjs2UK1Q > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Category.pm b/Koha/Schema/Result/Category.pm >index 4926587..0cdba22 100644 >--- a/Koha/Schema/Result/Category.pm >+++ b/Koha/Schema/Result/Category.pm >@@ -102,13 +102,6 @@ __PACKAGE__->table("categories"); > is_nullable: 0 > size: 1 > >-=head2 BlockExpiredPatronOpacActions >- >- accessor: 'block_expired_patron_opac_actions' >- data_type: 'tinyint' >- default_value: -1 >- is_nullable: 0 >- > =head2 default_privacy > > data_type: 'enum' >@@ -116,6 +109,13 @@ __PACKAGE__->table("categories"); > extra: {list => ["default","never","forever"]} > is_nullable: 0 > >+=head2 BlockExpiredPatronOpacActions >+ >+ accessor: 'block_expired_patron_opac_actions' >+ data_type: 'tinyint' >+ default_value: -1 >+ is_nullable: 0 >+ > =cut > > __PACKAGE__->add_columns( >@@ -147,13 +147,6 @@ __PACKAGE__->add_columns( > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "category_type", > { data_type => "varchar", default_value => "A", is_nullable => 0, size => 1 }, >- "BlockExpiredPatronOpacActions", >- { >- accessor => "block_expired_patron_opac_actions", >- data_type => "tinyint", >- default_value => -1, >- is_nullable => 0, >- }, > "default_privacy", > { > data_type => "enum", >@@ -161,6 +154,13 @@ __PACKAGE__->add_columns( > extra => { list => ["default", "never", "forever"] }, > is_nullable => 0, > }, >+ "BlockExpiredPatronOpacActions", >+ { >+ accessor => "block_expired_patron_opac_actions", >+ data_type => "tinyint", >+ default_value => -1, >+ is_nullable => 0, >+ }, > ); > > =head1 PRIMARY KEY >@@ -253,8 +253,8 @@ __PACKAGE__->might_have( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-08-18 13:01:05 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:T4i7vp1kAZFXy6DiV1dqyw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VvIIGRqjBIakxuHd+CTnRA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/ClassSource.pm b/Koha/Schema/Result/ClassSource.pm >index c6de4c4..1b7e898 100644 >--- a/Koha/Schema/Result/ClassSource.pm >+++ b/Koha/Schema/Result/ClassSource.pm >@@ -49,6 +49,12 @@ __PACKAGE__->table("class_sources"); > is_nullable: 0 > size: 10 > >+=head2 splitting_rule >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 64 >+ > =cut > > __PACKAGE__->add_columns( >@@ -66,6 +72,8 @@ __PACKAGE__->add_columns( > is_nullable => 0, > size => 10, > }, >+ "splitting_rule", >+ { data_type => "varchar", is_nullable => 1, size => 64 }, > ); > > =head1 PRIMARY KEY >@@ -98,8 +106,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2O58Q7wdbfAl6xmiW02PAA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0W99ECImafmOglV+fZmCZQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Deletedborrower.pm b/Koha/Schema/Result/Deletedborrower.pm >index 2b409b7..4c1674a 100644 >--- a/Koha/Schema/Result/Deletedborrower.pm >+++ b/Koha/Schema/Result/Deletedborrower.pm >@@ -283,6 +283,18 @@ __PACKAGE__->table("deletedborrowers"); > is_nullable: 1 > size: 100 > >+=head2 ethnicity >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 50 >+ >+=head2 ethnotes >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 255 >+ > =head2 sex > > data_type: 'varchar' >@@ -508,6 +520,10 @@ __PACKAGE__->add_columns( > { data_type => "mediumtext", is_nullable => 1 }, > "relationship", > { data_type => "varchar", is_nullable => 1, size => 100 }, >+ "ethnicity", >+ { data_type => "varchar", is_nullable => 1, size => 50 }, >+ "ethnotes", >+ { data_type => "varchar", is_nullable => 1, size => 255 }, > "sex", > { data_type => "varchar", is_nullable => 1, size => 1 }, > "password", >@@ -549,8 +565,8 @@ __PACKAGE__->add_columns( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-10-06 10:38:42 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NofxbMGIuZqlGCqvjPEI1Q >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FEc3DunxET/+t5TmOwT4hA > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/ImportBatch.pm b/Koha/Schema/Result/ImportBatch.pm >index 5413d39..ac26511 100644 >--- a/Koha/Schema/Result/ImportBatch.pm >+++ b/Koha/Schema/Result/ImportBatch.pm >@@ -99,13 +99,6 @@ __PACKAGE__->table("import_batches"); > extra: {list => ["batch","z3950","webservice"]} > is_nullable: 0 > >-=head2 record_type >- >- data_type: 'enum' >- default_value: 'biblio' >- extra: {list => ["biblio","auth","holdings"]} >- is_nullable: 0 >- > =head2 file_name > > data_type: 'varchar' >@@ -117,6 +110,13 @@ __PACKAGE__->table("import_batches"); > data_type: 'mediumtext' > is_nullable: 1 > >+=head2 record_type >+ >+ data_type: 'enum' >+ default_value: 'biblio' >+ extra: {list => ["biblio","auth","holdings"]} >+ is_nullable: 0 >+ > =cut > > __PACKAGE__->add_columns( >@@ -192,6 +192,10 @@ __PACKAGE__->add_columns( > extra => { list => ["batch", "z3950", "webservice"] }, > is_nullable => 0, > }, >+ "file_name", >+ { data_type => "varchar", is_nullable => 1, size => 100 }, >+ "comments", >+ { data_type => "mediumtext", is_nullable => 1 }, > "record_type", > { > data_type => "enum", >@@ -199,10 +203,6 @@ __PACKAGE__->add_columns( > extra => { list => ["biblio", "auth", "holdings"] }, > is_nullable => 0, > }, >- "file_name", >- { data_type => "varchar", is_nullable => 1, size => 100 }, >- "comments", >- { data_type => "mediumtext", is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -235,8 +235,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-30 03:46:54 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4UfJtTeAzzsuBycjsn2foQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4vQdHH3hjEuWSkYyaI3Ozw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Issue.pm b/Koha/Schema/Result/Issue.pm >index 0144a86..99c5553 100644 >--- a/Koha/Schema/Result/Issue.pm >+++ b/Koha/Schema/Result/Issue.pm >@@ -101,6 +101,18 @@ __PACKAGE__->table("issues"); > default_value: 0 > is_nullable: 0 > >+=head2 downloadurl >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 512 >+ >+=head2 token >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 64 >+ > =cut > > __PACKAGE__->add_columns( >@@ -151,6 +163,10 @@ __PACKAGE__->add_columns( > }, > "onsite_checkout", > { data_type => "integer", default_value => 0, is_nullable => 0 }, >+ "downloadurl", >+ { data_type => "varchar", is_nullable => 1, size => 512 }, >+ "token", >+ { data_type => "varchar", is_nullable => 1, size => 64 }, > ); > > =head1 PRIMARY KEY >@@ -222,8 +238,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-11-04 12:00:58 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kREecsHr6wZPiokS946BHw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hNMjQTvUsQItccNXjMMAgQ > > __PACKAGE__->belongs_to( > "borrower", >diff --git a/Koha/Schema/Result/Itemtype.pm b/Koha/Schema/Result/Itemtype.pm >index 0be9faf..6fb7d6a 100644 >--- a/Koha/Schema/Result/Itemtype.pm >+++ b/Koha/Schema/Result/Itemtype.pm >@@ -35,6 +35,12 @@ __PACKAGE__->table("itemtypes"); > data_type: 'mediumtext' > is_nullable: 1 > >+=head2 categoriesearch >+ >+ data_type: 'varchar' >+ is_nullable: 0 >+ size: 15 >+ > =head2 rentalcharge > > data_type: 'double precision' >@@ -46,6 +52,12 @@ __PACKAGE__->table("itemtypes"); > data_type: 'smallint' > is_nullable: 1 > >+=head2 notdisplayopac >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 15 >+ > =head2 imageurl > > data_type: 'varchar' >@@ -86,7 +98,7 @@ __PACKAGE__->table("itemtypes"); > > data_type: 'varchar' > is_nullable: 1 >- size: 80 >+ size: 15 > > =cut > >@@ -95,10 +107,14 @@ __PACKAGE__->add_columns( > { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 }, > "description", > { data_type => "mediumtext", is_nullable => 1 }, >+ "categoriesearch", >+ { data_type => "varchar", is_nullable => 0, size => 15 }, > "rentalcharge", > { data_type => "double precision", is_nullable => 1, size => [16, 4] }, > "notforloan", > { data_type => "smallint", is_nullable => 1 }, >+ "notdisplayopac", >+ { data_type => "varchar", is_nullable => 1, size => 15 }, > "imageurl", > { data_type => "varchar", is_nullable => 1, size => 200 }, > "summary", >@@ -117,7 +133,7 @@ __PACKAGE__->add_columns( > "hideinopac", > { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "searchcategory", >- { data_type => "varchar", is_nullable => 1, size => 80 }, >+ { data_type => "varchar", is_nullable => 1, size => 15 }, > ); > > =head1 PRIMARY KEY >@@ -165,8 +181,8 @@ __PACKAGE__->might_have( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-10-22 11:11:19 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nknZ3AB923k+tEw7whtzQA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jhuJFgWiIdqAKxNpr2kx9w > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Letter.pm b/Koha/Schema/Result/Letter.pm >index 04261e2..348a52c 100644 >--- a/Koha/Schema/Result/Letter.pm >+++ b/Koha/Schema/Result/Letter.pm >@@ -136,7 +136,7 @@ __PACKAGE__->belongs_to( > "message_transport_type", > "Koha::Schema::Result::MessageTransportType", > { message_transport_type => "message_transport_type" }, >- { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+ { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" }, > ); > > =head2 message_transports >@@ -159,8 +159,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2014-05-02 18:04:32 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HFUQ+/BKlweHglzOlm0lUQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Kl9DqOlOuOALKMLJXeU0Hg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/MessageQueue.pm b/Koha/Schema/Result/MessageQueue.pm >index 346b463..6ac7a01 100644 >--- a/Koha/Schema/Result/MessageQueue.pm >+++ b/Koha/Schema/Result/MessageQueue.pm >@@ -82,6 +82,11 @@ __PACKAGE__->table("message_queue"); > data_type: 'mediumtext' > is_nullable: 1 > >+=head2 sentto_address >+ >+ data_type: 'mediumtext' >+ is_nullable: 1 >+ > =head2 from_address > > data_type: 'mediumtext' >@@ -125,6 +130,8 @@ __PACKAGE__->add_columns( > }, > "to_address", > { data_type => "mediumtext", is_nullable => 1 }, >+ "sentto_address", >+ { data_type => "mediumtext", is_nullable => 1 }, > "from_address", > { data_type => "mediumtext", is_nullable => 1 }, > "content_type", >@@ -181,8 +188,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-06-22 16:37:20 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nQcmtLCbGEeLFLFP4jwy2g >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fYeAw5j22GJHZ93zFFh90Q > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/OldIssue.pm b/Koha/Schema/Result/OldIssue.pm >index 6daaa40..d3570ba 100644 >--- a/Koha/Schema/Result/OldIssue.pm >+++ b/Koha/Schema/Result/OldIssue.pm >@@ -100,6 +100,18 @@ __PACKAGE__->table("old_issues"); > default_value: 0 > is_nullable: 0 > >+=head2 downloadurl >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 512 >+ >+=head2 token >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 64 >+ > =cut > > __PACKAGE__->add_columns( >@@ -150,6 +162,10 @@ __PACKAGE__->add_columns( > }, > "onsite_checkout", > { data_type => "integer", default_value => 0, is_nullable => 0 }, >+ "downloadurl", >+ { data_type => "varchar", is_nullable => 1, size => 512 }, >+ "token", >+ { data_type => "varchar", is_nullable => 1, size => 64 }, > ); > > =head1 PRIMARY KEY >@@ -207,8 +223,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-04-23 13:04:51 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9GdzytyInRcFZns/q0qb3Q >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EUdlTU+977/ieg8IczWbLw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Overduerule.pm b/Koha/Schema/Result/Overduerule.pm >index 8392d1a..93a3d4f 100644 >--- a/Koha/Schema/Result/Overduerule.pm >+++ b/Koha/Schema/Result/Overduerule.pm >@@ -55,6 +55,12 @@ __PACKAGE__->table("overduerules"); > is_nullable: 1 > size: 1 > >+=head2 invoice1 >+ >+ data_type: 'integer' >+ default_value: 0 >+ is_nullable: 1 >+ > =head2 delay2 > > data_type: 'integer' >@@ -67,6 +73,12 @@ __PACKAGE__->table("overduerules"); > is_nullable: 1 > size: 1 > >+=head2 invoice2 >+ >+ data_type: 'integer' >+ default_value: 0 >+ is_nullable: 1 >+ > =head2 letter2 > > data_type: 'varchar' >@@ -90,6 +102,12 @@ __PACKAGE__->table("overduerules"); > default_value: 0 > is_nullable: 1 > >+=head2 invoice3 >+ >+ data_type: 'integer' >+ default_value: 0 >+ is_nullable: 1 >+ > =cut > > __PACKAGE__->add_columns( >@@ -103,10 +121,14 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 20 }, > "debarred1", > { data_type => "varchar", default_value => 0, is_nullable => 1, size => 1 }, >+ "invoice1", >+ { data_type => "integer", default_value => 0, is_nullable => 1 }, > "delay2", > { data_type => "integer", is_nullable => 1 }, > "debarred2", > { data_type => "varchar", default_value => 0, is_nullable => 1, size => 1 }, >+ "invoice2", >+ { data_type => "integer", default_value => 0, is_nullable => 1 }, > "letter2", > { data_type => "varchar", is_nullable => 1, size => 20 }, > "delay3", >@@ -115,6 +137,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 20 }, > "debarred3", > { data_type => "integer", default_value => 0, is_nullable => 1 }, >+ "invoice3", >+ { data_type => "integer", default_value => 0, is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -152,8 +176,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2014-05-02 18:04:32 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zQK4gTxkrPPwJzujbZxxdg >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wnpr7SjiybvE85EPXunZlQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Patronimage.pm b/Koha/Schema/Result/Patronimage.pm >index 8feb4a0..2b6a43d 100644 >--- a/Koha/Schema/Result/Patronimage.pm >+++ b/Koha/Schema/Result/Patronimage.pm >@@ -26,6 +26,7 @@ __PACKAGE__->table("patronimage"); > =head2 borrowernumber > > data_type: 'integer' >+ default_value: 0 > is_foreign_key: 1 > is_nullable: 0 > >@@ -44,7 +45,12 @@ __PACKAGE__->table("patronimage"); > > __PACKAGE__->add_columns( > "borrowernumber", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, >+ { >+ data_type => "integer", >+ default_value => 0, >+ is_foreign_key => 1, >+ is_nullable => 0, >+ }, > "mimetype", > { data_type => "varchar", is_nullable => 0, size => 15 }, > "imagefile", >@@ -81,8 +87,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uuRGyWlemwOH1PCkvhqxdQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kyIvx7njXV5g9cDA4FspeQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Session.pm b/Koha/Schema/Result/Session.pm >index 322c091..110bbd5 100644 >--- a/Koha/Schema/Result/Session.pm >+++ b/Koha/Schema/Result/Session.pm >@@ -32,7 +32,7 @@ __PACKAGE__->table("sessions"); > =head2 a_session > > data_type: 'mediumtext' >- is_nullable: 0 >+ is_nullable: 1 > > =cut > >@@ -40,7 +40,7 @@ __PACKAGE__->add_columns( > "id", > { data_type => "varchar", is_nullable => 0, size => 32 }, > "a_session", >- { data_type => "mediumtext", is_nullable => 0 }, >+ { data_type => "mediumtext", is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -56,8 +56,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("id"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-04-23 13:21:59 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gsbP76fskUOelxUl8nAVMQ >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cZjdYdeQLMm8UxaKKfLTYQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Subscription.pm b/Koha/Schema/Result/Subscription.pm >index 62468a0..938253d 100644 >--- a/Koha/Schema/Result/Subscription.pm >+++ b/Koha/Schema/Result/Subscription.pm >@@ -113,15 +113,15 @@ __PACKAGE__->table("subscription"); > data_type: 'integer' > is_nullable: 1 > >-=head2 innerloop1 >+=head2 lastvalue2 > > data_type: 'integer' >- default_value: 0 > is_nullable: 1 > >-=head2 lastvalue2 >+=head2 innerloop1 > > data_type: 'integer' >+ default_value: 0 > is_nullable: 1 > > =head2 innerloop2 >@@ -130,15 +130,15 @@ __PACKAGE__->table("subscription"); > default_value: 0 > is_nullable: 1 > >-=head2 lastvalue3 >+=head2 innerloop3 > > data_type: 'integer' >+ default_value: 0 > is_nullable: 1 > >-=head2 innerloop3 >+=head2 lastvalue3 > > data_type: 'integer' >- default_value: 0 > is_nullable: 1 > > =head2 firstacquidate >@@ -292,16 +292,16 @@ __PACKAGE__->add_columns( > { data_type => "varchar", default_value => "", is_nullable => 0, size => 100 }, > "lastvalue1", > { data_type => "integer", is_nullable => 1 }, >- "innerloop1", >- { data_type => "integer", default_value => 0, is_nullable => 1 }, > "lastvalue2", > { data_type => "integer", is_nullable => 1 }, >+ "innerloop1", >+ { data_type => "integer", default_value => 0, is_nullable => 1 }, > "innerloop2", > { data_type => "integer", default_value => 0, is_nullable => 1 }, >- "lastvalue3", >- { data_type => "integer", is_nullable => 1 }, > "innerloop3", > { data_type => "integer", default_value => 0, is_nullable => 1 }, >+ "lastvalue3", >+ { data_type => "integer", is_nullable => 1 }, > "firstacquidate", > { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, > "manualhistory", >@@ -429,8 +429,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:57kc1/B3eNKQXAk9tlOy0A >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mp9/FRyx50TbPwrjiwfvMw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Virtualshelve.pm b/Koha/Schema/Result/Virtualshelve.pm >index bd6c050..43b49e5 100644 >--- a/Koha/Schema/Result/Virtualshelve.pm >+++ b/Koha/Schema/Result/Virtualshelve.pm >@@ -47,6 +47,11 @@ __PACKAGE__->table("virtualshelves"); > is_nullable: 1 > size: 1 > >+=head2 useascarrousel >+ >+ data_type: 'tinyint' >+ is_nullable: 1 >+ > =head2 sortfield > > data_type: 'varchar' >@@ -86,6 +91,12 @@ __PACKAGE__->table("virtualshelves"); > default_value: 0 > is_nullable: 1 > >+=head2 addtocarrousel >+ >+ data_type: 'tinyint' >+ default_value: 0 >+ is_nullable: 1 >+ > =cut > > __PACKAGE__->add_columns( >@@ -97,6 +108,8 @@ __PACKAGE__->add_columns( > { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "category", > { data_type => "varchar", is_nullable => 1, size => 1 }, >+ "useascarrousel", >+ { data_type => "tinyint", is_nullable => 1 }, > "sortfield", > { > data_type => "varchar", >@@ -124,6 +137,8 @@ __PACKAGE__->add_columns( > { data_type => "tinyint", default_value => 1, is_nullable => 1 }, > "allow_delete_other", > { data_type => "tinyint", default_value => 0, is_nullable => 1 }, >+ "addtocarrousel", >+ { data_type => "tinyint", default_value => 0, is_nullable => 1 }, > ); > > =head1 PRIMARY KEY >@@ -191,8 +206,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-11-05 10:39:28 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:O3y89+0IUoePtcIHAqR+oA >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:npHiyjqUGJJwXU9Zo9X3SQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Z3950server.pm b/Koha/Schema/Result/Z3950server.pm >index d3f3f50..db7207e 100644 >--- a/Koha/Schema/Result/Z3950server.pm >+++ b/Koha/Schema/Result/Z3950server.pm >@@ -120,6 +120,12 @@ __PACKAGE__->table("z3950servers"); > data_type: 'mediumtext' > is_nullable: 1 > >+=head2 attributes >+ >+ data_type: 'varchar' >+ is_nullable: 1 >+ size: 255 >+ > =cut > > __PACKAGE__->add_columns( >@@ -167,6 +173,8 @@ __PACKAGE__->add_columns( > { data_type => "mediumtext", is_nullable => 1 }, > "add_xslt", > { data_type => "mediumtext", is_nullable => 1 }, >+ "attributes", >+ { data_type => "varchar", is_nullable => 1, size => 255 }, > ); > > =head1 PRIMARY KEY >@@ -182,8 +190,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("id"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-09-01 10:16:04 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:q0y03nGYIt0eDIVui0UUdw >+# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:XeNXCA+zQY0u3Z0ulYjOjQ > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 802e35e..8df47b1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -239,6 +239,7 @@ function validate1(date) { > <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorborrowernumber %]">[% guarantorsurname %][%IF ( guarantorfirstname ) %], [% guarantorfirstname %] [% END %]</a></li> > [% END %] > [% END %] >+ <li><span class="label">Main contact method: </span>[% primary_contact_method %]</li> > </ol> > </div> > <div class="action"> >diff --git a/members/moremember.pl b/members/moremember.pl >index 688215b..d2e4f62 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -339,6 +339,7 @@ $template->param( > borrowernumber => $borrowernumber, > othernames => $data->{'othernames'}, > categoryname => $data->{'description'}, >+ primary_contact_method => $data->{'primary_contact_method'}, > was_renewed => $input->param('was_renewed') ? 1 : 0, > branch => $branch, > todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11879
:
25745
|
25922
|
25941
|
31300
|
31301
|
31320
|
34351
|
34482
|
34502
|
34503
|
34571
|
34572
|
34573
|
41209
|
41220
|
41221
|
41222
|
46101
|
46284
|
46285
|
46286
|
48073
|
48074
|
48075
|
48076
|
48077
|
48078
|
48079
|
48556
|
48557
|
48558
|
48559
|
50433
|
52607
|
52608
|
52614
|
52615
|
52616
|
52617
|
52618
|
52619
|
52620
|
53229
|
53688
|
53695
|
53705
|
53707
|
53708
|
53709
|
53710
|
53711
|
53712
|
53713
|
55946
|
56285
|
56286
|
58580
|
58591
|
58592
|
58593
|
63238
|
63239
|
65811
|
65812
|
69028
|
69029
|
69050
|
71955
|
71956
|
71957
|
71958
|
72632
|
72633
|
72634
|
72635
|
73987
|
73988
|
73989
|
73990
|
74123
|
74124
|
74125
|
74126
|
74818
|
75652
|
83757
|
83758
|
84017
|
84018
|
84019
|
84020
|
84021
|
84022
|
88358
|
88359
|
88360
|
88361
|
88362
|
88363
|
88394
|
88395
|
88396
|
88397
|
88398
|
88399
|
88400
|
93850
|
93851
|
93852
|
93853
|
93854
|
93855
|
93856
|
93900
|
93901
|
94456
|
94457
|
94458
|
94459
|
94460
|
94461
|
94463
|
94464
|
94465
|
94466
|
94467
|
94468
|
96432
|
100817
|
100843
|
112062
|
112063
|
112064
|
112557
|
112559
|
112560
|
118959
|
118960
|
118961
|
118962
|
118985
|
118986
|
118987
|
118988
|
120947
|
120948
|
120949
|
120950
|
122778