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

(-)a/admin/marctagstructure.pl (-6 lines)
Lines 248-256 if ($op eq 'add_form') { Link Here
248
			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
248
			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
249
            $row_data{ind1_defaultvalue} = $results[$i]->{'mts_ind1_defaultvalue'};
249
            $row_data{ind1_defaultvalue} = $results[$i]->{'mts_ind1_defaultvalue'};
250
            $row_data{ind2_defaultvalue} = $results[$i]->{'mts_ind2_defaultvalue'};
250
            $row_data{ind2_defaultvalue} = $results[$i]->{'mts_ind2_defaultvalue'};
251
			$row_data{subfield_link} = "marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
252
			$row_data{edit}          = "$script_name?op=add_form&searchfield="            .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
253
			$row_data{delete}        = "$script_name?op=delete_confirm&searchfield="      .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
254
			$j=$i;
251
			$j=$i;
255
			my @internal_loop = ();
252
			my @internal_loop = ();
256
			while ( ( $j < $cnt ) and ( $results[$i]->{'tagfield'} == $results[$j]->{'tagfield'} ) ) {
253
			while ( ( $j < $cnt ) and ( $results[$i]->{'tagfield'} == $results[$j]->{'tagfield'} ) ) {
Lines 295-303 if ($op eq 'add_form') { Link Here
295
			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
292
			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
296
            $row_data{ind1_defaultvalue} = $results->[$i]{'ind1_defaultvalue'};
293
            $row_data{ind1_defaultvalue} = $results->[$i]{'ind1_defaultvalue'};
297
            $row_data{ind2_defaultvalue} = $results->[$i]{'ind2_defaultvalue'};
294
            $row_data{ind2_defaultvalue} = $results->[$i]{'ind2_defaultvalue'};
298
			$row_data{subfield_link}    = "marc_subfields_structure.pl?tagfield="          .$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
299
			$row_data{edit}             = "$script_name?op=add_form&amp;searchfield="      .$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
300
			$row_data{delete}           = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
301
			push(@loop_data, \%row_data);
295
			push(@loop_data, \%row_data);
302
		}
296
		}
303
		$template->param(loop => \@loop_data);
297
		$template->param(loop => \@loop_data);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt (-34 / +7 lines)
Lines 41-47 Link Here
41
41
42
[% IF ( else ) %]
42
[% IF ( else ) %]
43
<div id="toolbar" class="btn-toolbar">
43
<div id="toolbar" class="btn-toolbar">
44
    <a class="btn btn-default btn-sm" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% framework.frameworkcode | html %]"><i class="fa fa-plus"></i> New tag</a>
44
    <a class="btn btn-default btn-sm" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-plus"></i> New tag</a>
45
</div>[% END %]
45
</div>[% END %]
46
46
47
<h1>MARC Framework for [% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]default MARC framework[% END %]</h1>
47
<h1>MARC Framework for [% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]default MARC framework[% END %]</h1>
Lines 184-201 Link Here
184
        </tr>
184
        </tr>
185
    </thead>
185
    </thead>
186
    <tbody>
186
    <tbody>
187
    [% IF ( select_display ) %]
187
    [% FOREACH loo IN loop %]
188
        [% FOREACH loo IN loop %]
189
        <tr>
188
        <tr>
190
            <td>[% loo.tagfield | html %]</td>
189
            <td>[% loo.tagfield | html %]</td>
191
            <td>
190
            <td>
192
                [% loo.liblibrarian | html %]
191
                [% loo.liblibrarian | html %]
192
            [% IF ( select_display ) %]
193
                [% FOREACH subfield IN loo.subfields %]
193
                [% FOREACH subfield IN loo.subfields %]
194
                    <p>
194
                    <p>
195
                        Tab:[% subfield.tab | html %] | $[% subfield.tagsubfield | html %]
195
                        Tab:[% subfield.tab | html %] | $[% subfield.tagsubfield | html %]
196
                        [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso | html %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
196
                        [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso | html %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
197
                    </p>
197
                    </p>
198
                [% END %]
198
                [% END %]
199
            [% END %]
199
            </td>
200
            </td>
200
            <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
201
            <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
201
            <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
202
            <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
Lines 207-249 Link Here
207
                    <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
208
                    <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
208
                        Actions <b class="caret"></b></a>
209
                        Actions <b class="caret"></b></a>
209
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]">
210
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]">
210
                        <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
211
                        <li><a href="marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield | uri %]&amp;frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
211
                        <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
212
                        <li><a href="?op=add_form&amp;searchfield=[% loo.tagfield | uri %]&amp;frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
212
                        <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
213
                        <li><a href="?op=delete_confirm&amp;searchfield=[% loo.tagfield | uri %]&amp;frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
213
                    </ul>
214
                    </ul>
214
                </div>
215
                </div>
215
            </td>
216
            </td>
216
        </tr>
217
        </tr>
217
        [% END %]
218
    [% ELSE %]
219
    [% FOREACH loo IN loop %]
220
    <tr>
221
        <td>[% loo.tagfield | html %]</td>
222
        <td>[% loo.liblibrarian | html %]</td>
223
        <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
224
        <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
225
        <td>[% loo.authorised_value | html %]</td>
226
        <td>[% loo.ind1_defaultvalue | html %]</td>
227
        <td>[% loo.ind2_defaultvalue | html %]</td>
228
        <td>
229
            <div class="dropdown">
230
                <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
231
                    Actions <b class="caret"></b></a>
232
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]">
233
                    <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
234
                    <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
235
                    <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
236
                </ul>
237
            </div>
238
        </td>
239
    </tr>
240
    [% END %]
241
    [% END %]
218
    [% END %]
242
    </tbody>
219
    </tbody>
243
    </table>
220
    </table>
244
245
246
247
[% END %]
221
[% END %]
248
222
249
            </main>
223
            </main>
250
- 

Return to bug 21704