gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_9497' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-01-31 10:53:45 -05:00
parent 03b7c9f8b9 3f2b5d270c
commit 2ef8ff9846
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/z3950servers.pl
View File

@ -97,9 +97,9 @@ if ($op eq 'add_form') {
$sth->finish;
}
$template->param( $_ => $data->{$_} )
for ( qw( host port db userid password checked rank timeout ) );
for ( qw( host port db userid password checked rank timeout encoding ) );
$template->param( $_ . $data->{$_} => 1)
for ( qw( syntax encoding ) );
for ( qw( syntax ) );
# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB

30
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
View File

@ -203,30 +203,12 @@
<li><label for="encoding">Encoding (z3950 can send<br /> records in various encodings. Choose one): </label>
<select name="encoding">
[% IF ( encodingutf8 ) %]
<option value="utf8" selected="selected">UTF-8</option>
[% ELSE %]
<option value="utf8">UTF-8</option>
[% END %]
[% IF ( encodingEUC_KR ) %]
<option value="EUC-KR" selected="selected">EUC-KR</option>
[% ELSE %]
<option value="EUC-KR">EUC-KR</option>
[% END %]
[% IF ( encodingISO_5426 ) %]
<option value="ISO_5426" selected="selected">ISO_5426</option>
[% ELSE %]
<option value="ISO_5426">ISO_5426</option>
[% END %]
[% IF ( encodingISO_6937 ) %]
<option value="ISO_6937" selected="selected">ISO_6937</option>
[% ELSE %]
<option value="ISO_6937">ISO_6937</option>
[% END %]
[% IF ( encodingMARC_8 ) %]
<option value="MARC-8" selected="selected">MARC-8</option>
[% ELSE %]
<option value="MARC-8">MARC-8</option>
[% FOREACH enc IN [ 'utf8' 'EUC-KR' 'ISO_5426' 'ISO_6937' 'ISO_8859-1' 'MARC-8' ] %]
[% IF ( encoding == enc ) %]
<option value="[% enc %]" selected="selected">[% enc %]</option>
[% ELSE %]
<option value="[% enc %]">[% enc %]</option>
[% END %]
[% END %]
</select>
</li>