Bugzilla – Attachment 86760 Details for
Bug 22330
Transfer limits should be respected for placing holds in staff interface and APIs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22330: (QA follow-up) Remove duplicate use lines, combine and sort remaning lines
Bug-22330-QA-follow-up-Remove-duplicate-use-lines-.patch (text/plain), 4.63 KB, created by
Liz Rea
on 2019-03-19 18:33:03 UTC
(
hide
)
Description:
Bug 22330: (QA follow-up) Remove duplicate use lines, combine and sort remaning lines
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2019-03-19 18:33:03 UTC
Size:
4.63 KB
patch
obsolete
>From 85979b592c8741610263f40da2465921e990ba02 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Mon, 11 Mar 2019 14:26:49 -0400 >Subject: [PATCH] Bug 22330: (QA follow-up) Remove duplicate use lines, combine > and sort remaning lines > >Signed-off-by: Liz Rea <wizzyrea@gmail.com> >--- > C4/Reserves.pm | 8 ++------ > Koha/Schema/Result/Accountline.pm | 12 ++---------- > Koha/Schema/Result/SocialData.pm | 7 ++++--- > Koha/Schema/Result/Statistic.pm | 12 ++---------- > 4 files changed, 10 insertions(+), 29 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 48b4170a69..de7e3f0a2c 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -23,19 +23,16 @@ package C4::Reserves; > > use strict; > #use warnings; FIXME - Bug 2505 >+ > use C4::Accounts; > use C4::Biblio; > use C4::Circulation; > use C4::Context; > use C4::Items; >-use C4::Members; >- >-# for _koha_notify_reserve > use C4::Letters; > use C4::Log; >-use C4::Members qw(); > use C4::Members::Messaging; >- >+use C4::Members; > use Koha::Account::Lines; > use Koha::Biblios; > use Koha::Calendar; >@@ -48,7 +45,6 @@ use Koha::IssuingRules; > use Koha::ItemTypes; > use Koha::Items; > use Koha::Libraries; >-use Koha::Libraries; > use Koha::Old::Hold; > use Koha::Patrons; > >diff --git a/Koha/Schema/Result/Accountline.pm b/Koha/Schema/Result/Accountline.pm >index b5e220a90e..d07db2b773 100644 >--- a/Koha/Schema/Result/Accountline.pm >+++ b/Koha/Schema/Result/Accountline.pm >@@ -40,12 +40,6 @@ __PACKAGE__->table("accountlines"); > is_foreign_key: 1 > is_nullable: 1 > >-=head2 accountno >- >- data_type: 'smallint' >- default_value: 0 >- is_nullable: 0 >- > =head2 itemnumber > > data_type: 'integer' >@@ -126,8 +120,6 @@ __PACKAGE__->add_columns( > { data_type => "integer", is_nullable => 1 }, > "borrowernumber", > { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, >- "accountno", >- { data_type => "smallint", default_value => 0, is_nullable => 0 }, > "itemnumber", > { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, > "date", >@@ -264,8 +256,8 @@ __PACKAGE__->belongs_to( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-01-03 16:10:04 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BO7iSB+QzoJNuZ8Uttba6A >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-03-11 15:18:19 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vrZgLS4lFNQlWXHLGDeXJA > > sub koha_objects_class { > 'Koha::Account::Lines'; >diff --git a/Koha/Schema/Result/SocialData.pm b/Koha/Schema/Result/SocialData.pm >index b2d835b0b0..43f4904cfa 100644 >--- a/Koha/Schema/Result/SocialData.pm >+++ b/Koha/Schema/Result/SocialData.pm >@@ -26,6 +26,7 @@ __PACKAGE__->table("social_data"); > =head2 isbn > > data_type: 'varchar' >+ default_value: (empty string) > is_nullable: 0 > size: 30 > >@@ -64,7 +65,7 @@ __PACKAGE__->table("social_data"); > > __PACKAGE__->add_columns( > "isbn", >- { data_type => "varchar", is_nullable => 0, size => 30 }, >+ { data_type => "varchar", default_value => "", is_nullable => 0, size => 30 }, > "num_critics", > { data_type => "integer", is_nullable => 1 }, > "num_critics_pro", >@@ -92,8 +93,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("isbn"); > > >-# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-11-13 15:24:28 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:l44tYFEfIKX0xXzj6AHInQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-03-11 15:18:21 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VSgglsYCYVTVWOzD7hIrLg > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/Statistic.pm b/Koha/Schema/Result/Statistic.pm >index 45fe021a0e..8f61a57115 100644 >--- a/Koha/Schema/Result/Statistic.pm >+++ b/Koha/Schema/Result/Statistic.pm >@@ -35,12 +35,6 @@ __PACKAGE__->table("statistics"); > is_nullable: 1 > size: 10 > >-=head2 proccode >- >- data_type: 'varchar' >- is_nullable: 1 >- size: 4 >- > =head2 value > > data_type: 'double precision' >@@ -108,8 +102,6 @@ __PACKAGE__->add_columns( > }, > "branch", > { data_type => "varchar", is_nullable => 1, size => 10 }, >- "proccode", >- { data_type => "varchar", is_nullable => 1, size => 4 }, > "value", > { data_type => "double precision", is_nullable => 1, size => [16, 4] }, > "type", >@@ -133,8 +125,8 @@ __PACKAGE__->add_columns( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-09-26 16:15:09 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OECp3uSP488L8TUoS1HseQ >+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-03-11 15:18:21 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FFi5MupRV2uIu340ihDv3Q > > > # You can replace this text with custom content, and it will be preserved on regeneration >-- >2.11.0
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 22330
:
85067
|
85068
|
86479
|
86480
|
86481
|
86482
|
86758
|
86759
|
86760
|
86779
|
86802
|
86803
|
86804
|
86805
|
86806
|
86807