Attachment 89891 Details for Bug 14570 – Bug 14570: (QA Follow-up) Misc changes based on QA feedback

[patch] Bug 14570: (QA Follow-up) Misc changes based on QA feedback

Bug-14570-QA-Follow-up-Misc-changes-based-on-QA-fe.patch (text/plain), 4.01 KB, created by Kyle M Hall (khall) on 2019-05-17 12:17:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2019-05-17 12:17:24 UTC

Size: 4.01 KB

patch

obsolete

>From 398b087bf2feffa41fc318aed535fddf2a79a62d Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 21 Feb 2019 06:27:02 -0500
>Subject: [PATCH] Bug 14570: (QA Follow-up) Misc changes based on QA feedback
>
>---
> Koha/Object.pm                                        |  7 ++-----
> installer/data/mysql/atomicupdate/bug_14570.perl      |  2 +-
> .../prog/en/modules/members/memberentrygen.tt         |  2 +-
> misc/cronjobs/j2a.pl                                  | 11 +++++++----
> 4 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/Koha/Object.pm b/Koha/Object.pm
>index 8de78d927b..04d34c49e3 100644
>--- a/Koha/Object.pm
>+++ b/Koha/Object.pm
>@@ -73,11 +73,8 @@ sub new {
>             delete $attributes->{$column_name};
>         }
> 
>-        eval {
>-            $self->{_result} =
>-              $schema->resultset( $class->_type() )->new($attributes);
>-        };
>-        Carp::cluck("ERROR: $@") if $@;
>+        $self->{_result} =
>+          $schema->resultset( $class->_type() )->new($attributes);
>     }
> 
>     croak("No _type found! Koha::Object must be subclassed!")
>diff --git a/installer/data/mysql/atomicupdate/bug_14570.perl b/installer/data/mysql/atomicupdate/bug_14570.perl
>index 92b26f29a9..967fd34a21 100644
>--- a/installer/data/mysql/atomicupdate/bug_14570.perl
>+++ b/installer/data/mysql/atomicupdate/bug_14570.perl
>@@ -12,7 +12,7 @@ if( CheckVersion( $DBversion ) ) {
>                   PRIMARY KEY (id),
>                   CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
>                   CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
>-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
>+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
>         });
> 
>         $dbh->do(q{
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index ec200302ff..54c21b43cc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -1231,7 +1231,7 @@
>             [% END %]
> 
>             [% IF guarantor %]
>-                select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) | $raw %] );
>+                select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) | html %] );
>             [% END %]
> 
>             $("#cn_max").hide();
>diff --git a/misc/cronjobs/j2a.pl b/misc/cronjobs/j2a.pl
>index d66b80ad18..a63666be39 100755
>--- a/misc/cronjobs/j2a.pl
>+++ b/misc/cronjobs/j2a.pl
>@@ -129,7 +129,9 @@ if ( not $fromcat && $tocat ) {    #make sure we've specified the info we need.
> 
> cronlogaction();
> 
>-my $dbh = C4::Context->dbh;
>+my $dbh      = C4::Context->dbh;
>+my $database = Koha::Database->new();
>+my $schema   = $database->schema;
> 
> #get today's date, format it and subtract upperagelimit
> my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
>@@ -166,7 +168,6 @@ my $itsyourbirthday = "$year-$mon-$mday";
> 
> if ( not $noaction ) {
>     # Start a transaction since we need to delete from relationships and update borrowers atomically
>-    $dbh->{AutoCommit} = 0;
> 
>     my $success = 1;
>     if ($mybranch) {    #yep, we received a specific branch to work on.
>@@ -183,6 +184,8 @@ if ( not $noaction ) {
>               )
>         |;
> 
>+        $schema->storage->txn_begin;
>+
>         my $query = qq|
>             DELETE relationships FROM relationships
>             LEFT JOIN borrowers ON ( borrowers.borrowernumber = relationships.guarantee_id )
>@@ -202,9 +205,9 @@ if ( not $noaction ) {
>           or $success = 0;
> 
>         if ( $success ) {
>-            $dbh->commit;
>+            $schema->storage->txn_commit;
>         } else {
>-            $dbh->rollback;
>+            $schema->storage->txn_rollback;
>             die "can't execute";
>         }
> 
>-- 
>2.20.1 (Apple Git-117)

Actions: View | Diff | Splinter Review

Attachments on bug 14570: 52400 | 52401 | 52402 | 52403 | 52406 | 52407 | 58146 | 58147 | 58159 | 58202 | 58391 | 58399 | 58412 | 58688 | 58689 | 58739 | 58762 | 58763 | 58764 | 58834 | 58835 | 58836 | 58837 | 58838 | 58839 | 58949 | 58950 | 58951 | 58952 | 58953 | 58954 | 58972 | 58973 | 58974 | 58975 | 58976 | 58977 | 58978 | 58979 | 58980 | 62450 | 62451 | 62452 | 64124 | 64125 | 64126 | 71160 | 71161 | 71162 | 71163 | 73283 | 73284 | 73583 | 73584 | 74950 | 74951 | 74952 | 74953 | 74954 | 74976 | 74977 | 74978 | 74979 | 77029 | 77030 | 77031 | 77032 | 77033 | 77034 | 77040 | 77041 | 77042 | 77043 | 77044 | 77045 | 77046 | 77047 | 77048 | 77049 | 77067 | 77068 | 77069 | 77070 | 77071 | 77072 | 77073 | 77074 | 77075 | 77076 | 77077 | 77078 | 77290 | 77291 | 77346 | 77347 | 77348 | 80842 | 80849 | 81932 | 81933 | 85411 | 85412 | 85431 | 89889 | 89890 | 89891 | 89892 | 89909 | 89910 | 89911 | 89912 | 89921 | 89922 | 89929 | 90048 | 91231 | 91439 | 91440 | 91441 | 91442 | 91443 | 91444 | 91445 | 91694 | 91695 | 91696 | 91697 | 91698 | 91699 | 91700 | 92157 | 92158 | 92161 | 92162 | 92163 | 92180 | 92181 | 92182 | 92183 | 92232 | 92233 | 92234 | 92235 | 92277 | 92278 | 92279 | 92280 | 92281 | 92282 | 92283 | 92284 | 92285 | 92286 | 92287 | 92288 | 92289 | 92290 | 92291 | 92292 | 92298 | 92299 | 92300 | 92301 | 92302 | 92303 | 92304 | 92305 | 92306 | 92307 | 92308 | 92309 | 92310 | 92311 | 92312 | 92313 | 92314 | 92315 | 92316 | 92317 | 92318 | 92319 | 92320 | 92321 | 92322 | 92323 | 92324 | 92325 | 92346 | 92347 | 92348 | 92349 | 92350