Bugzilla – Attachment 43199 Details for
Bug 14610
Add ability to place article requests in Koha
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14610 - Update Schema files
Bug-14610---Update-Schema-files.patch (text/plain), 24.53 KB, created by
Kyle M Hall (khall)
on 2015-10-07 17:02:51 UTC
(
hide
)
Description:
Bug 14610 - Update Schema files
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-10-07 17:02:51 UTC
Size:
24.53 KB
patch
obsolete
>From 2bd818a0b5515945ba2bb8992e91eede512e4b81 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 7 Oct 2015 12:22:50 -0400 >Subject: [PATCH] Bug 14610 - Update Schema files > >--- > Koha/Schema/Result/ArticleRequest.pm | 258 ++++++++++++++++++++ > Koha/Schema/Result/Biblio.pm | 19 ++- > Koha/Schema/Result/Borrower.pm | 78 +++++-- > Koha/Schema/Result/BorrowerModification.pm | 20 +-- > Koha/Schema/Result/Branch.pm | 19 ++- > Koha/Schema/Result/Deletedborrower.pm | 20 +-- > Koha/Schema/Result/Issuingrule.pm | 26 ++- > Koha/Schema/Result/Item.pm | 31 ++- > .../Result/MarcModificationTemplateAction.pm | 18 +- > Koha/Schema/Result/OldIssue.pm | 27 +-- > Koha/Schema/Result/OldReserve.pm | 16 +- > Koha/Schema/Result/Printer.pm | 44 ++-- > Koha/Schema/Result/Reserve.pm | 16 +- > 13 files changed, 470 insertions(+), 122 deletions(-) > create mode 100644 Koha/Schema/Result/ArticleRequest.pm > >diff --git a/Koha/Schema/Result/ArticleRequest.pm b/Koha/Schema/Result/ArticleRequest.pm >new file mode 100644 >index 0000000..a117a18 >--- /dev/null >+++ b/Koha/Schema/Result/ArticleRequest.pm >@@ -0,0 +1,258 @@ >+use utf8; >+package Koha::Schema::Result::ArticleRequest; >+ >+# Created by DBIx::Class::Schema::Loader >+# DO NOT MODIFY THE FIRST PART OF THIS FILE >+ >+=head1 NAME >+ >+Koha::Schema::Result::ArticleRequest >+ >+=cut >+ >+use strict; >+use warnings; >+ >+use base 'DBIx::Class::Core'; >+ >+=head1 TABLE: C<article_requests> >+ >+=cut >+ >+__PACKAGE__->table("article_requests"); >+ >+=head1 ACCESSORS >+ >+=head2 id >+ >+ data_type: 'integer' >+ is_auto_increment: 1 >+ is_nullable: 0 >+ >+=head2 borrowernumber >+ >+ data_type: 'integer' >+ is_foreign_key: 1 >+ is_nullable: 0 >+ >+=head2 biblionumber >+ >+ data_type: 'integer' >+ is_foreign_key: 1 >+ is_nullable: 0 >+ >+=head2 itemnumber >+ >+ data_type: 'integer' >+ is_foreign_key: 1 >+ is_nullable: 1 >+ >+=head2 branchcode >+ >+ data_type: 'varchar' >+ is_foreign_key: 1 >+ is_nullable: 1 >+ size: 10 >+ >+=head2 title >+ >+ data_type: 'text' >+ is_nullable: 1 >+ >+=head2 author >+ >+ data_type: 'text' >+ is_nullable: 1 >+ >+=head2 volume >+ >+ data_type: 'text' >+ is_nullable: 1 >+ >+=head2 issue >+ >+ data_type: 'text' >+ is_nullable: 1 >+ >+=head2 date >+ >+ data_type: 'text' >+ is_nullable: 1 >+ >+=head2 pages >+ >+ data_type: 'text' >+ is_nullable: 1 >+ >+=head2 chapters >+ >+ data_type: 'text' >+ is_nullable: 1 >+ >+=head2 status >+ >+ data_type: 'enum' >+ default_value: 'OPEN' >+ extra: {list => ["OPEN","PROCESSING","COMPLETED","CANCELED"]} >+ is_nullable: 0 >+ >+=head2 notes >+ >+ data_type: 'text' >+ is_nullable: 1 >+ >+=head2 created_on >+ >+ data_type: 'timestamp' >+ datetime_undef_if_invalid: 1 >+ default_value: current_timestamp >+ is_nullable: 0 >+ >+=head2 updated_on >+ >+ data_type: 'timestamp' >+ datetime_undef_if_invalid: 1 >+ is_nullable: 1 >+ >+=cut >+ >+__PACKAGE__->add_columns( >+ "id", >+ { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, >+ "borrowernumber", >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, >+ "biblionumber", >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, >+ "itemnumber", >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, >+ "branchcode", >+ { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 }, >+ "title", >+ { data_type => "text", is_nullable => 1 }, >+ "author", >+ { data_type => "text", is_nullable => 1 }, >+ "volume", >+ { data_type => "text", is_nullable => 1 }, >+ "issue", >+ { data_type => "text", is_nullable => 1 }, >+ "date", >+ { data_type => "text", is_nullable => 1 }, >+ "pages", >+ { data_type => "text", is_nullable => 1 }, >+ "chapters", >+ { data_type => "text", is_nullable => 1 }, >+ "status", >+ { >+ data_type => "enum", >+ default_value => "OPEN", >+ extra => { list => ["OPEN", "PROCESSING", "COMPLETED", "CANCELED"] }, >+ is_nullable => 0, >+ }, >+ "notes", >+ { data_type => "text", is_nullable => 1 }, >+ "created_on", >+ { >+ data_type => "timestamp", >+ datetime_undef_if_invalid => 1, >+ default_value => \"current_timestamp", >+ is_nullable => 0, >+ }, >+ "updated_on", >+ { >+ data_type => "timestamp", >+ datetime_undef_if_invalid => 1, >+ is_nullable => 1, >+ }, >+); >+ >+=head1 PRIMARY KEY >+ >+=over 4 >+ >+=item * L</id> >+ >+=back >+ >+=cut >+ >+__PACKAGE__->set_primary_key("id"); >+ >+=head1 RELATIONS >+ >+=head2 biblionumber >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::Biblio> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "biblionumber", >+ "Koha::Schema::Result::Biblio", >+ { biblionumber => "biblionumber" }, >+ { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+); >+ >+=head2 borrowernumber >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::Borrower> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "borrowernumber", >+ "Koha::Schema::Result::Borrower", >+ { borrowernumber => "borrowernumber" }, >+ { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, >+); >+ >+=head2 branchcode >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::Branch> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "branchcode", >+ "Koha::Schema::Result::Branch", >+ { branchcode => "branchcode" }, >+ { >+ is_deferrable => 1, >+ join_type => "LEFT", >+ on_delete => "SET NULL", >+ on_update => "CASCADE", >+ }, >+); >+ >+=head2 itemnumber >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::Item> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "itemnumber", >+ "Koha::Schema::Result::Item", >+ { itemnumber => "itemnumber" }, >+ { >+ is_deferrable => 1, >+ join_type => "LEFT", >+ on_delete => "SET NULL", >+ on_update => "CASCADE", >+ }, >+); >+ >+ >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-10-05 12:05:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2oZywCYhBizoEbp96pdIcQ >+ >+ >+# You can replace this text with custom code or comments, and it will be preserved on regeneration >+1; >diff --git a/Koha/Schema/Result/Biblio.pm b/Koha/Schema/Result/Biblio.pm >index 54f6727..e1f3b2d 100644 >--- a/Koha/Schema/Result/Biblio.pm >+++ b/Koha/Schema/Result/Biblio.pm >@@ -152,6 +152,21 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 article_requests >+ >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::ArticleRequest> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "article_requests", >+ "Koha::Schema::Result::ArticleRequest", >+ { "foreign.biblionumber" => "self.biblionumber" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ > =head2 biblioimages > > Type: has_many >@@ -303,7 +318,7 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-07-08 15:06:22 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vh7DAGajJCEzHE7YmAG3jg >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-07-28 10:45:00 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ilygO1c15l0SXYruaJo49w > > 1; >diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm >index e9f8838..808a5e0 100644 >--- a/Koha/Schema/Result/Borrower.pm >+++ b/Koha/Schema/Result/Borrower.pm >@@ -285,18 +285,6 @@ __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' >@@ -401,6 +389,12 @@ __PACKAGE__->table("borrowers"); > is_nullable: 1 > size: 50 > >+=head2 sms_provider_id >+ >+ data_type: 'integer' >+ is_foreign_key: 1 >+ is_nullable: 1 >+ > =head2 privacy > > data_type: 'integer' >@@ -534,10 +528,6 @@ __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", >@@ -574,6 +564,8 @@ __PACKAGE__->add_columns( > { data_type => "varchar", is_nullable => 1, size => 50 }, > "smsalertnumber", > { data_type => "varchar", is_nullable => 1, size => 50 }, >+ "sms_provider_id", >+ { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "privacy", > { data_type => "integer", default_value => 1, is_nullable => 0 }, > ); >@@ -693,6 +685,21 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 article_requests >+ >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::ArticleRequest> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "article_requests", >+ "Koha::Schema::Result::ArticleRequest", >+ { "foreign.borrowernumber" => "self.borrowernumber" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ > =head2 borrower_attributes > > Type: has_many >@@ -873,6 +880,21 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 items_last_borrowers >+ >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::ItemsLastBorrower> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "items_last_borrowers", >+ "Koha::Schema::Result::ItemsLastBorrower", >+ { "foreign.borrowernumber" => "self.borrowernumber" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ > =head2 message_queues > > Type: has_many >@@ -1008,6 +1030,26 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 sms_provider >+ >+Type: belongs_to >+ >+Related object: L<Koha::Schema::Result::SmsProvider> >+ >+=cut >+ >+__PACKAGE__->belongs_to( >+ "sms_provider", >+ "Koha::Schema::Result::SmsProvider", >+ { id => "sms_provider_id" }, >+ { >+ is_deferrable => 1, >+ join_type => "LEFT", >+ on_delete => "RESTRICT", >+ on_update => "RESTRICT", >+ }, >+); >+ > =head2 subscriptionroutinglists > > Type: has_many >@@ -1154,8 +1196,8 @@ Composing rels: L</aqorder_users> -> ordernumber > __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-04-27 16:08:40 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Z50zYBD3Hqlv5/EnoLnyZw >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-10-07 07:49:58 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fnHSfYRgUIXfryLGlrJXZw > > > # 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 b61c0c7..269c2a5 100644 >--- a/Koha/Schema/Result/BorrowerModification.pm >+++ b/Koha/Schema/Result/BorrowerModification.pm >@@ -295,18 +295,6 @@ __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' >@@ -540,10 +528,6 @@ __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", >@@ -599,8 +583,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("verification_token", "borrowernumber"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-08-18 13:01:05 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xUfsaCL/IR4h5U7AKHmFzw >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-10-07 07:49:58 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TrDyluQOsGU1fnrGh8IcUg > > > # 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..7e056dd 100644 >--- a/Koha/Schema/Result/Branch.pm >+++ b/Koha/Schema/Result/Branch.pm >@@ -202,6 +202,21 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 article_requests >+ >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::ArticleRequest> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "article_requests", >+ "Koha::Schema::Result::ArticleRequest", >+ { "foreign.branchcode" => "self.branchcode" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ > =head2 authorised_values_branches > > 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.07040 @ 2015-10-05 12:05:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8pDEOdJcxKIJW6kAcIDOYA > > > # 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 8c438ba..e95a785 100644 >--- a/Koha/Schema/Result/Deletedborrower.pm >+++ b/Koha/Schema/Result/Deletedborrower.pm >@@ -283,18 +283,6 @@ __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' >@@ -520,10 +508,6 @@ __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", >@@ -565,8 +549,8 @@ __PACKAGE__->add_columns( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-08-18 13:01:05 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cRaxMYFjVG7JB7AvsdCweg >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-10-07 07:49:59 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AoaPnI0J5R89ziu2SO5UBQ > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm >index 438c23b..beb4413 100644 >--- a/Koha/Schema/Result/Issuingrule.pm >+++ b/Koha/Schema/Result/Issuingrule.pm >@@ -148,6 +148,12 @@ __PACKAGE__->table("issuingrules"); > default_value: 0 > is_nullable: 0 > >+=head2 holds_per_record >+ >+ data_type: 'smallint' >+ default_value: 1 >+ is_nullable: 0 >+ > =head2 branchcode > > data_type: 'varchar' >@@ -174,6 +180,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( >@@ -226,6 +239,8 @@ __PACKAGE__->add_columns( > { data_type => "tinyint", default_value => 0, is_nullable => 1 }, > "reservesallowed", > { data_type => "smallint", default_value => 0, is_nullable => 0 }, >+ "holds_per_record", >+ { data_type => "smallint", default_value => 1, is_nullable => 0 }, > "branchcode", > { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 }, > "overduefinescap", >@@ -234,6 +249,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 +275,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-10-05 12:05:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BuOcHnkxlFi7agAWg0sC9g > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm >index c342f46..df99205 100644 >--- a/Koha/Schema/Result/Item.pm >+++ b/Koha/Schema/Result/Item.pm >@@ -425,6 +425,21 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >+=head2 article_requests >+ >+Type: has_many >+ >+Related object: L<Koha::Schema::Result::ArticleRequest> >+ >+=cut >+ >+__PACKAGE__->has_many( >+ "article_requests", >+ "Koha::Schema::Result::ArticleRequest", >+ { "foreign.itemnumber" => "self.itemnumber" }, >+ { cascade_copy => 0, cascade_delete => 0 }, >+); >+ > =head2 biblioitemnumber > > Type: belongs_to >@@ -555,17 +570,17 @@ __PACKAGE__->has_many( > { cascade_copy => 0, cascade_delete => 0 }, > ); > >-=head2 old_issues >+=head2 items_last_borrower > >-Type: has_many >+Type: might_have > >-Related object: L<Koha::Schema::Result::OldIssue> >+Related object: L<Koha::Schema::Result::ItemsLastBorrower> > > =cut > >-__PACKAGE__->has_many( >- "old_issues", >- "Koha::Schema::Result::OldIssue", >+__PACKAGE__->might_have( >+ "items_last_borrower", >+ "Koha::Schema::Result::ItemsLastBorrower", > { "foreign.itemnumber" => "self.itemnumber" }, > { cascade_copy => 0, cascade_delete => 0 }, > ); >@@ -616,8 +631,8 @@ __PACKAGE__->might_have( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-04-23 12:42:12 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:urSpNt7LBda4T5Plhi6cPw >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-10-05 12:05:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SuwK+FM6ln1whQMW9gDOng > > sub effective_itemtype { > my ( $self ) = @_; >diff --git a/Koha/Schema/Result/MarcModificationTemplateAction.pm b/Koha/Schema/Result/MarcModificationTemplateAction.pm >index d6771e1..030ead0 100644 >--- a/Koha/Schema/Result/MarcModificationTemplateAction.pm >+++ b/Koha/Schema/Result/MarcModificationTemplateAction.pm >@@ -43,8 +43,8 @@ __PACKAGE__->table("marc_modification_template_actions"); > =head2 action > > data_type: 'enum' >- extra: {list => ["delete_field","update_field","move_field","copy_field"]} >- is_nullable: 0 >+ extra: {list => ["delete_field","update_field","move_field","copy_field","copy_and_replace_field"]} >+ is_nullable: 1 > > =head2 field_number > >@@ -152,9 +152,15 @@ __PACKAGE__->add_columns( > { > data_type => "enum", > extra => { >- list => ["delete_field", "update_field", "move_field", "copy_field"], >+ list => [ >+ "delete_field", >+ "update_field", >+ "move_field", >+ "copy_field", >+ "copy_and_replace_field", >+ ], > }, >- is_nullable => 0, >+ is_nullable => 1, > }, > "field_number", > { data_type => "smallint", default_value => 0, is_nullable => 0 }, >@@ -228,8 +234,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-31 22:03:59 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sl0AD0sWPYcKRjHN3l3eFg >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-10-05 12:05:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ABLNsTQXblDEZTGWQ5LmTA > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/OldIssue.pm b/Koha/Schema/Result/OldIssue.pm >index 6daaa40..ba12add 100644 >--- a/Koha/Schema/Result/OldIssue.pm >+++ b/Koha/Schema/Result/OldIssue.pm >@@ -37,7 +37,6 @@ __PACKAGE__->table("old_issues"); > =head2 itemnumber > > data_type: 'integer' >- is_foreign_key: 1 > is_nullable: 1 > > =head2 date_due >@@ -108,7 +107,7 @@ __PACKAGE__->add_columns( > "borrowernumber", > { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "itemnumber", >- { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, >+ { data_type => "integer", is_nullable => 1 }, > "date_due", > { > data_type => "datetime", >@@ -186,29 +185,9 @@ __PACKAGE__->belongs_to( > }, > ); > >-=head2 itemnumber >- >-Type: belongs_to >- >-Related object: L<Koha::Schema::Result::Item> >- >-=cut >- >-__PACKAGE__->belongs_to( >- "itemnumber", >- "Koha::Schema::Result::Item", >- { itemnumber => "itemnumber" }, >- { >- is_deferrable => 1, >- join_type => "LEFT", >- on_delete => "SET NULL", >- on_update => "SET NULL", >- }, >-); >- > >-# 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.07040 @ 2015-10-05 12:05:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zK8c497/M5+qUGoNLl4Qlg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/OldReserve.pm b/Koha/Schema/Result/OldReserve.pm >index 2f7100a..0129bd2 100644 >--- a/Koha/Schema/Result/OldReserve.pm >+++ b/Koha/Schema/Result/OldReserve.pm >@@ -129,6 +129,12 @@ __PACKAGE__->table("old_reserves"); > datetime_undef_if_invalid: 1 > is_nullable: 1 > >+=head2 printed >+ >+ data_type: 'datetime' >+ datetime_undef_if_invalid: 1 >+ is_nullable: 1 >+ > =cut > > __PACKAGE__->add_columns( >@@ -177,6 +183,12 @@ __PACKAGE__->add_columns( > datetime_undef_if_invalid => 1, > is_nullable => 1, > }, >+ "printed", >+ { >+ data_type => "datetime", >+ datetime_undef_if_invalid => 1, >+ is_nullable => 1, >+ }, > ); > > =head1 PRIMARY KEY >@@ -254,8 +266,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-06-30 08:51:40 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wGi7SO5Sz+IwuvqaAyQDbg >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-10-05 12:05:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TyCBk+/ITZ4VzxpMBzOdyg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Printer.pm b/Koha/Schema/Result/Printer.pm >index 7386f2a..8b44e86 100644 >--- a/Koha/Schema/Result/Printer.pm >+++ b/Koha/Schema/Result/Printer.pm >@@ -23,51 +23,55 @@ __PACKAGE__->table("printers"); > > =head1 ACCESSORS > >-=head2 printername >+=head2 id > >- data_type: 'varchar' >- default_value: (empty string) >+ data_type: 'integer' >+ is_auto_increment: 1 > is_nullable: 0 >- size: 40 > >-=head2 printqueue >+=head2 name > >- data_type: 'varchar' >+ data_type: 'text' >+ is_nullable: 0 >+ >+=head2 queue >+ >+ data_type: 'text' > is_nullable: 1 >- size: 20 > >-=head2 printtype >+=head2 type > >- data_type: 'varchar' >+ data_type: 'text' > is_nullable: 1 >- size: 20 > > =cut > > __PACKAGE__->add_columns( >- "printername", >- { data_type => "varchar", default_value => "", is_nullable => 0, size => 40 }, >- "printqueue", >- { data_type => "varchar", is_nullable => 1, size => 20 }, >- "printtype", >- { data_type => "varchar", is_nullable => 1, size => 20 }, >+ "id", >+ { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, >+ "name", >+ { data_type => "text", is_nullable => 0 }, >+ "queue", >+ { data_type => "text", is_nullable => 1 }, >+ "type", >+ { data_type => "text", is_nullable => 1 }, > ); > > =head1 PRIMARY KEY > > =over 4 > >-=item * L</printername> >+=item * L</id> > > =back > > =cut > >-__PACKAGE__->set_primary_key("printername"); >+__PACKAGE__->set_primary_key("id"); > > >-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OaIxwtdwn0TJLggwOygC2w >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-10-05 12:05:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Azf83iQPMGJpxWowO3EK7Q > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Reserve.pm b/Koha/Schema/Result/Reserve.pm >index f87fc22..aa2be86 100644 >--- a/Koha/Schema/Result/Reserve.pm >+++ b/Koha/Schema/Result/Reserve.pm >@@ -133,6 +133,12 @@ __PACKAGE__->table("reserves"); > datetime_undef_if_invalid: 1 > is_nullable: 1 > >+=head2 printed >+ >+ data_type: 'datetime' >+ datetime_undef_if_invalid: 1 >+ is_nullable: 1 >+ > =cut > > __PACKAGE__->add_columns( >@@ -191,6 +197,12 @@ __PACKAGE__->add_columns( > datetime_undef_if_invalid => 1, > is_nullable => 1, > }, >+ "printed", >+ { >+ data_type => "datetime", >+ datetime_undef_if_invalid => 1, >+ is_nullable => 1, >+ }, > ); > > =head1 PRIMARY KEY >@@ -278,8 +290,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-06-30 08:51:40 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uHHqseJ56g3nDyKnNncyUA >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-10-05 12:05:51 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:h7jkbIPxF550/i0iwWZmFw > > __PACKAGE__->belongs_to( > "item", >-- >1.7.2.5
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 14610
:
42822
|
42823
|
42824
|
42825
|
42826
|
42827
|
42828
|
42829
|
43198
|
43199
|
43200
|
43201
|
43202
|
43264
|
43265
|
43266
|
43267
|
43268
|
43270
|
43271
|
43272
|
43273
|
43274
|
43278
|
43279
|
43280
|
43281
|
43282
|
43654
|
43655
|
43656
|
43657
|
43658
|
44219
|
44220
|
44221
|
44222
|
44223
|
44224
|
44225
|
44226
|
44227
|
44228
|
44229
|
44230
|
44231
|
44232
|
44233
|
44234
|
44235
|
44236
|
44237
|
44238
|
44239
|
44240
|
44241
|
44242
|
44916
|
44917
|
44918
|
44919
|
44920
|
44921
|
44922
|
44923
|
44924
|
44925
|
44926
|
45946
|
45947
|
45948
|
45949
|
45950
|
45951
|
45952
|
45953
|
45954
|
45955
|
45956
|
46518
|
46519
|
46520
|
46521
|
46522
|
46523
|
46524
|
46525
|
46526
|
46527
|
46528
|
46529
|
46530
|
46595
|
46596
|
46597
|
46598
|
46599
|
46600
|
46601
|
46602
|
46603
|
46604
|
46605
|
46606
|
46607
|
46608
|
46609
|
46610
|
46611
|
46612
|
47905
|
47906
|
47907
|
47908
|
47909
|
47910
|
47911
|
47912
|
47913
|
47914
|
47915
|
47916
|
47917
|
47918
|
47919
|
47920
|
47921
|
47922
|
48177
|
48178
|
48179
|
48180
|
48181
|
48182
|
48212
|
48213
|
48214
|
48215
|
48216
|
48217
|
48218
|
50348
|
50349
|
50350
|
50351
|
50352
|
50353
|
50354
|
51527
|
51528
|
51529
|
51530
|
51531
|
51532
|
51533
|
51534
|
51778
|
51779
|
51780
|
51781
|
51782
|
51783
|
52688
|
52689
|
52690
|
52691
|
52692
|
52693
|
55556
|
55557
|
55558
|
55559
|
55560
|
55561
|
55568
|
55569
|
56084
|
56085
|
56086
|
56087
|
56088
|
56089
|
56090
|
56318
|
56319
|
56320
|
56321
|
56322
|
56323
|
56324
|
56325
|
56326
|
56327
|
56328
|
56775
|
56776
|
56777
|
56778
|
56779
|
56780
|
56781
|
56782
|
56783
|
56784
|
56785
|
56816
|
56854
|
56855
|
56856
|
56857
|
56858
|
56859
|
56860
|
56861
|
56862
|
56863
|
56864
|
56865