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

(-)a/cataloguing/addbiblio.pl (-1 / +1 lines)
Lines 835-841 if ( $op eq "addbiblio" ) { Link Here
835
            ModBiblio( $record, $biblionumber, $frameworkcode, {
835
            ModBiblio( $record, $biblionumber, $frameworkcode, {
836
                    context => {
836
                    context => {
837
                        source => $z3950 ? 'z39.50' : 'intranet',
837
                        source => $z3950 ? 'z39.50' : 'intranet',
838
                        category => $member->{'category_type'},
838
                        categorycode => $member->categorycode,
839
                        borrower => $loggedinuser
839
                        borrower => $loggedinuser
840
                    }
840
                    }
841
                }
841
                }
(-)a/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl (-1 / +1 lines)
Lines 11-17 if( CheckVersion( $DBversion ) ) { Link Here
11
    $dbh->do( $sql );
11
    $dbh->do( $sql );
12
12
13
    $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('source', 'source from where modification request was sent', 0);" );
13
    $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('source', 'source from where modification request was sent', 0);" );
14
    $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('category', 'categorycode of user who requested modification', 1);" );
14
    $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('categorycode', 'categorycode of user who requested modification', 1);" );
15
    $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('borrower', 'borrowernumber of user who requested modification', 2);" );
15
    $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('borrower', 'borrowernumber of user who requested modification', 2);" );
16
16
17
    $sql = q{
17
    $sql = q{
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt (-5 / +5 lines)
Lines 115-133 $(document).ready(function(){ Link Here
115
        'remove': 1,
115
        'remove': 1,
116
        'delete': 1
116
        'delete': 1
117
      },
117
      },
118
      'Protect existing': {
118
      'Add new': {
119
        'add': 1,
119
        'add': 1,
120
        'append': 0,
120
        'append': 0,
121
        'remove': 0,
121
        'remove': 0,
122
        'delete': 0
122
        'delete': 0
123
      },
123
      },
124
      'Add only': {
124
      'Add and append': {
125
        'add': 1,
125
        'add': 1,
126
        'append': 1,
126
        'append': 1,
127
        'remove': 0,
127
        'remove': 0,
128
        'delete': 0
128
        'delete': 0
129
      },
129
      },
130
      'Protect from delete': {
130
      'Protect from deletion': {
131
        'add': 1,
131
        'add': 1,
132
        'append': 1,
132
        'append': 1,
133
        'remove': 1,
133
        'remove': 1,
Lines 269-275 $(document).ready(function(){ Link Here
269
            <th>
269
            <th>
270
                <select name="preset">
270
                <select name="preset">
271
                    <option value="" selected>Custom</option>
271
                    <option value="" selected>Custom</option>
272
                    [% FOR preset IN ['Protect', 'Overwrite', 'Protect existing', 'Add only', 'Protect from delete'] %]
272
                    [% FOR preset IN ['Protect', 'Overwrite', 'Add new', 'Add and append', 'Protect from deletion'] %]
273
                        <option value="[% preset %]">[% preset %]</option>
273
                        <option value="[% preset %]">[% preset %]</option>
274
                    [% END %]
274
                    [% END %]
275
                </select>
275
                </select>
Lines 324-330 $(document).ready(function(){ Link Here
324
                <th>
324
                <th>
325
                    <select name="preset">
325
                    <select name="preset">
326
                        <option value="" selected>Custom</option>
326
                        <option value="" selected>Custom</option>
327
                        [% FOR preset IN ['Protect', 'Overwrite', 'Protect existing', 'Add only', 'Protect from delete'] %]
327
                        [% FOR preset IN ['Protect', 'Overwrite', 'Add new', 'Add and append', 'Protect from deletion'] %]
328
                            <option value="[% preset %]">[% preset %]</option>
328
                            <option value="[% preset %]">[% preset %]</option>
329
                        [% END %]
329
                        [% END %]
330
                    </select>
330
                    </select>
(-)a/tools/batch_record_modification.pl (-2 / +1 lines)
Lines 209-215 if ( $op eq 'form' ) { Link Here
209
                ModBiblio( $record, $biblionumber, $frameworkcode,
209
                ModBiblio( $record, $biblionumber, $frameworkcode,
210
                    {
210
                    {
211
                        source => 'batchmod',
211
                        source => 'batchmod',
212
                        category => $member->{'category_type'},
212
                        categorycode => $member->categorycode,
213
                        borrower => $loggedinuser
213
                        borrower => $loggedinuser
214
                    }
214
                    }
215
                );
215
                );
216
- 

Return to bug 14957