https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22993
--- Comment #13 from Victor Grousset/tuxayo <[email protected]> --- I don't see a simple way to solve the conflict. Can you attach your 20.11.x version here? Here is the conflict I get. We can see that there is another patch missing for 20.11.x that changes stuffs and this ticket just adds the block with if EnhancedMessagingPreferences The 3 sections are: <<<<<<< the code on 20.11.x before the patch ||||||| the code on 21.05.x before the patch ======= the code on 21.05.x after the patch >>>>>>> <<<<<<< HEAD $c->res->headers->location( $c->req->url->to_string . '/' . $patron->borrowernumber ); return $c->render( status => 201, openapi => $patron->to_api ||||||| parent of ced32711bb (Bug 22993: Handle default messaging preferences during patron creation from API) my $body = $c->validation->param('body'); my $extended_attributes = delete $body->{extended_attributes} // []; my $patron = Koha::Patron->new_from_api($body)->store; $patron->extended_attributes( [ map { { code => $_->{type}, attribute => $_->{value} } } @$extended_attributes ] ); $c->res->headers->location($c->req->url->to_string . '/' . $patron->borrowernumber); return $c->render( status => 201, openapi => $patron->to_api ); } ======= my $body = $c->validation->param('body'); my $extended_attributes = delete $body->{extended_attributes} // []; my $patron = Koha::Patron->new_from_api($body)->store; $patron->extended_attributes( [ map { { code => $_->{type}, attribute => $_->{value} } } @$extended_attributes ] ); if ( C4::Context->preference('EnhancedMessagingPreferences') ) { C4::Members::Messaging::SetMessagingPreferencesFromDefaults( { borrowernumber => $patron->borrowernumber, categorycode => $patron->categorycode, } ); } $c->res->headers->location($c->req->url->to_string . '/' . $patron->borrowernumber); return $c->render( status => 201, openapi => $patron->to_api ); } >>>>>>> ced32711bb (Bug 22993: Handle default messaging preferences during >>>>>>> patron creation from API) -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
