Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 34478: Manual fix - add op - members/housebound

Browse source 
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Kyle Hall 2024-02-01 12:08:14 -05:00 committed by Jonathan Druart
parent 0a92c55c7e
commit 7bd78700cf
Signed by: jonathan.druart
GPG key ID: A085E712BEF0E0F0
2 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
View file

@ -111,15 +111,14 @@
[% END %]
<!-- Create or edit housebound_profile -->
[% IF ( method == 'update_or_create' ) %]
<form id="editform" method="post" name="editform"
[% INCLUDE 'csrf-token.inc' %]
action="/cgi-bin/koha/members/housebound.pl">
[% IF ( op == 'update_or_create' ) %]
<form id="editform" method="post" name="editform" action="/cgi-bin/koha/members/housebound.pl">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
[% IF ( housebound_profile ) %]
<input type="hidden" name="method" value="updateconfirm" />
<input type="hidden" name="op" value="cud-updateconfirm" />
[% ELSE %]
<input type="hidden" name="method" value="createconfirm" />
<input type="hidden" name="op" value="cud-createconfirm" />
[% END %]
<fieldset id="houseboundentry" class="rows">
<legend>Manage housebound profile</legend>
@ -248,16 +247,16 @@
</form>
<!-- Create or edit housebound_visit -->
[% ELSIF ( method == 'visit_update_or_create' ) %]
[% ELSIF ( op == 'visit_update_or_create' ) %]
<h4>Manage housebound deliveries</h4>
<form name="form" id="instance_form" method="post"
[% INCLUDE 'csrf-token.inc' %]
action="/cgi-bin/koha/members/housebound.pl">
[% IF ( visit ) %]
<input type="hidden" name="method" value="editvisitconfirm" />
<input type="hidden" name="op" value="cud-editvisitconfirm" />
<input type="hidden" name="visit_id" value="[% visit.id | html %]" />
[% ELSE %]
<input type="hidden" name="method" value="addvisitconfirm" />
<input type="hidden" name="op" value="cud-addvisitconfirm" />
[% END %]
<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
<fieldset class="rows" id="instance">

28
members/housebound.pl
View file

@ -49,7 +49,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
);
my @messages; # For error messages.
my $method = $input->param('method') // q{};
my $op = $input->param('op') // q{};
my $visit_id = $input->param('visit_id') // q{};
# Get patron
@ -74,7 +74,7 @@ if ( $visit_id ) {
# Main processing
my ( $deliverers, $choosers, $houseboundvisit );
if ( $method eq 'updateconfirm' and $houseboundprofile ) {
if ( $op eq 'cud-updateconfirm' and $houseboundprofile ) {
# We have received the input from the profile edit form. We must save the
# changes, and return to simple display.
$houseboundprofile->set({
@ -89,8 +89,8 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
my $success = eval { return $houseboundprofile->store };
push @messages, { type => 'error', code => 'error_on_profile_store' }
if ( $@ or !$success );
$method = undef;
} elsif ( $method eq 'createconfirm' ) {
$op = undef;
} elsif ( $op eq 'cud-createconfirm' ) {
# We have received the input necessary to create a new profile. We must
# save it, and return to simple display.
$houseboundprofile = Koha::Patron::HouseboundProfile->new({
@ -106,19 +106,19 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
my $success = eval { return $houseboundprofile->store };
push @messages, { type => 'error', code => 'error_on_profile_create' }
if ( $@ or !$success );
$method = undef;
} elsif ( $method eq 'visit_update_or_create' ) {
$op = undef;
} elsif ( $op eq 'visit_update_or_create' ) {
# We want to edit, edit a visit, so we must pass its details.
$deliverers = Koha::Patrons->search_housebound_deliverers;
$choosers = Koha::Patrons->search_housebound_choosers;
$houseboundvisit = $visit;
} elsif ( $method eq 'visit_delete' and $visit ) {
} elsif ( $op eq 'visit_delete' and $visit ) {
# We want ot delete a specific visit.
my $success = eval { return $visit->delete };
push @messages, { type => 'error', code => 'error_on_visit_delete' }
if ( $@ or !$success );
$method = undef;
} elsif ( $method eq 'editvisitconfirm' and $visit ) {
$op = undef;
} elsif ( $op eq 'cud-editvisitconfirm' and $visit ) {
# We have received input for editing a visit. We must store and return to
# simple display.
$visit->set({
@ -131,8 +131,8 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
my $success = eval { return $visit->store };
push @messages, { type => 'error', code => 'error_on_visit_store' }
if ( $@ or !$success );
$method = undef;
} elsif ( $method eq 'addvisitconfirm' and !$visit ) {
$op = undef;
} elsif ( $op eq 'cud-addvisitconfirm' and !$visit ) {
# We have received input for creating a visit. We must store and return
# to simple display.
my $visit = Koha::Patron::HouseboundVisit->new({
@ -145,11 +145,11 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
my $success = eval { return $visit->store };
push @messages, { type => 'error', code => 'error_on_visit_create' }
if ( $@ or !$success );
$method = undef;
$op = undef;
}
# We don't have any profile information, so we must display a creation form.
$method = 'update_or_create' if ( !$houseboundprofile );
$op = 'update_or_create' if ( !$houseboundprofile );
# Ensure template has all patron details.
$template->param( patron => $patron );
@ -158,7 +158,7 @@ $template->param(
housebound_profile => $houseboundprofile,
visit => $houseboundvisit,
messages => \@messages,
method => $method,
op => $op,
choosers => $choosers,
deliverers => $deliverers,
houseboundview => 'on',