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

(-)a/admin/marc_subfields_structure.pl (+5 lines)
Lines 310-315 elsif ( $op eq 'add_validate' ) { Link Here
310 
                        ),
 310 
                        ),
311 
                    );
 311 
                    );
312 
                } else {
 312 
                } else {
313 
                    if( $frameworkcode ne q{} ) {
314 
                        # BZ 19096: Overwrite kohafield from Default when adding a new record
315 
                         my $rec = Koha::MarcSubfieldStructures->find( q{}, $tagfield, $tagsubfield );
316 
                        $kohafield = $rec->kohafield if $rec;
317 
                    }
313 
                    $sth_insert->execute(
 318 
                    $sth_insert->execute(
314 
                        $tagfield,
 319 
                        $tagfield,
315 
                        $tagsubfield,
 320 
                        $tagsubfield,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-1 / +1 lines)
Lines 70-76 Link Here
70 
                    <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></dt>
 70 
                    <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></dt>
71 
                    <dd>Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.</dd>
 71 
                    <dd>Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.</dd>
72 
                    <dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></dt>
 72 
                    <dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></dt>
73 
                    <dd>Define the mapping between the Koha transactional database (SQL) and the MARC Bibliographic records. Note that the mapping can be defined through MARC Bibliographic Framework. This tool is just a shortcut to speed up linkage.</dd>
 73 
                    <dd>Define the mapping between the Koha transactional database (SQL) and the MARC Bibliographic records.</dd>
74 
                    <dt><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></dt>
 74 
                    <dt><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></dt>
75 
                    <dd>Define the mapping between keywords and MARC fields. The keywords are used to find some data independently of the framework.</dd>
 75 
                    <dd>Define the mapping between keywords and MARC fields. The keywords are used to find some data independently of the framework.</dd>
76 
                    <dt><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></dt>
 76 
                    <dt><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></dt>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt (-2 / +4 lines)
Lines 143-149 Link Here
143 
                <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
 143 
                <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
144 
                <li>
 144 
                <li>
145 
                    <label for="kohafield[% loo.row %]">Koha link:</label>
 145 
                    <label for="kohafield[% loo.row %]">Koha link:</label>
146 
                    <select name="kohafield" id="kohafield[% loo.row %]" size="1">
 146 
                    <!-- This select should be DISABLED; value is submitted by the following hidden input -->
147 
                    <select name="kohafield" id="kohafield[% loo.row %]" size="1" disabled>
147 
                    [% FOREACH value IN loo.kohafields %]
 148 
                    [% FOREACH value IN loo.kohafields %]
148 
                      [% IF ( value == loo.kohafield ) %]
 149 
                      [% IF ( value == loo.kohafield ) %]
149 
                        <option value="[% value %]" selected="selected">[% value %]</option>
 150 
                        <option value="[% value %]" selected="selected">[% value %]</option>
Lines 152-157 Link Here
152 
                      [% END %]
 153 
                      [% END %]
153 
                    [% END %]
 154 
                    [% END %]
154 
                    </select>
 155 
                    </select>
156 
                    <!-- Do NOT remove this next hidden input! We need it to save kohafield. -->
157 
                    <input type="hidden" name="kohafield" value="[% loo.kohafield %]"/>
155 
                </li>
 158 
                </li>
156 
			</ol>
 159 
			</ol>
157 
            </fieldset>
 160 
            </fieldset>
158 
-

Return to bug 19096