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

(-)a/authorities/merge.pl (-16 / +15 lines)
Lines 157-193 else { Link Here
157
            }
157
            }
158
158
159
            # Getting frameworktext
159
            # Getting frameworktext
160
            my $frameworktext1 = Koha::Authority::Types->find( $recordObj1->authtypecode );
160
            my $frameworktext1           = Koha::Authority::Types->find( $recordObj1->authtypecode );
161
            my $frameworktext2 = Koha::Authority::Types->find( $recordObj2->authtypecode );
161
            my $frameworktext2           = Koha::Authority::Types->find( $recordObj2->authtypecode );
162
            my $frameworktextdestination = Koha::Authority::Types->find( $framework );
162
            my $frameworktextdestination = Koha::Authority::Types->find($framework);
163
163
164
            # Creating a loop for display
164
            # Creating a loop for display
165
165
166
            my @records = (
166
            my @records = (
167
                {
167
                {
168
                    recordid => $mergereference,
168
                    recordid      => $mergereference,
169
                    record => $recordObj1->record,
169
                    record        => $recordObj1->record,
170
                    frameworkcode => $recordObj1->authtypecode,
170
                    frameworkcode => $recordObj1->authtypecode,
171
                    frameworktext => $frameworktext1->authtypetext,
171
                    frameworktext => $frameworktext1->authtypetext,
172
                    display => $recordObj1->createMergeHash($tagslib),
172
                    display       => $recordObj1->createMergeHash($tagslib),
173
                    reference => 1,
173
                    reference     => 1,
174
                },
174
                },
175
                {
175
                {
176
                    recordid => $notreference,
176
                    recordid      => $notreference,
177
                    record => $recordObj2->record,
177
                    record        => $recordObj2->record,
178
                    frameworkcode => $recordObj2->authtypecode,
178
                    frameworkcode => $recordObj2->authtypecode,
179
                    frameworktext => $frameworktext2->authtypetext,
179
                    frameworktext => $frameworktext2->authtypetext,
180
                    display => $recordObj2->createMergeHash($tagslib),
180
                    display       => $recordObj2->createMergeHash($tagslib),
181
                },
181
                },
182
            );
182
            );
183
183
184
            # Parameters
184
            # Parameters
185
            $template->param(
185
            $template->param(
186
                recordid1        => $mergereference,
186
                recordid1         => $mergereference,
187
                recordid2        => $notreference,
187
                recordid2         => $notreference,
188
                records        => \@records,
188
                records           => \@records,
189
                framework      => $framework,
189
                framework         => $framework,
190
                frameworktext => $frameworktextdestination->authtypetext,
190
                frameworktext     => $frameworktextdestination->authtypetext,
191
                multipleauthtypes => ( $recordObj1->authtypecode ne $recordObj2->authtypecode ) ? 1 : 0,
191
                multipleauthtypes => ( $recordObj1->authtypecode ne $recordObj2->authtypecode ) ? 1 : 0,
192
            );
192
            );
193
        }
193
        }
194
- 

Return to bug 25387