View | Details | Raw Unified | Return to bug 9302
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-2 / +8 lines)
Lines 95-101 Link Here
95
            [% ELSIF action == 'merge' %]
95
            [% ELSIF action == 'merge' %]
96
                <h4>Results</h4>
96
                <h4>Results</h4>
97
                [% IF error %]
97
                [% IF error %]
98
                    <div class="dialog alert">Merge failed! The following error was reported: [% error %].</div>
98
                    [% IF error == 'INVALID_KEEPER' %]
99
                        <div class="dialog alert">Merge failed! The patron to keep was invalid.</div>
100
                    [% ELSE %]
101
                        <div class="dialog alert">Merge failed! The following error was reported: [% error %].</div>
102
                    [% END %]
99
                [% ELSIF !results.merged.keys.size %]
103
                [% ELSIF !results.merged.keys.size %]
100
                    <div class="dialog alert">No valid patrons to merge were found.</div>
104
                    <div class="dialog alert">No valid patrons to merge were found.</div>
101
                [% ELSE %]
105
                [% ELSE %]
Lines 123-129 Link Here
123
                    [% END %]
127
                    [% END %]
124
                [% END %]
128
                [% END %]
125
129
126
                <a class="btn btn-default btn-sm" href="moremember.pl?borrowernumber=[% keeper.id %]">View patron record</a>
130
                [% UNLESS error %]
131
                    <a class="btn btn-default btn-sm" href="moremember.pl?borrowernumber=[% keeper.id %]">View patron record</a>
132
                [% END %]
127
            [% END %]
133
            [% END %]
128
        </div>
134
        </div>
129
    </div>
135
    </div>
(-)a/members/merge-patrons.pl (-11 / +15 lines)
Lines 48-63 if ( $action eq 'show' ) { Link Here
48
    my $keeper_id = $cgi->param('keeper');
48
    my $keeper_id = $cgi->param('keeper');
49
    my $results;
49
    my $results;
50
50
51
    try {
51
    my $keeper = Koha::Patrons->find( $keeper_id );
52
        my $keeper = Koha::Patrons->find( $keeper_id );
52
53
        $results = $keeper->merge_with( \@ids );
53
    if ( $keeper ) {
54
        $template->param(
54
        try {
55
            keeper  => $keeper,
55
            $results = $keeper->merge_with( \@ids );
56
            results => $results
56
            $template->param(
57
        );
57
                keeper  => $keeper,
58
    }
58
                results => $results
59
    catch {
59
            );
60
        $template->param( error => $_ );
60
        }
61
        catch {
62
            $template->param( error => $_ );
63
        }
64
    } else {
65
        $template->param( error => 'INVALID_KEEPER' );
61
    }
66
    }
62
}
67
}
63
68
64
- 

Return to bug 9302