Skip to content

Commit 07848a8

Browse files
mblenkmblenk
committed
Bug 34355: Fix form rendering issue
1 parent 818afb6 commit 07848a8

File tree

1 file changed

+127
-18
lines changed

1 file changed

+127
-18
lines changed

‎koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt‎

Lines changed: 127 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
<title>
88
MARC Order Accounts
99
</title>
10-
<style>
11-
#fileuploadstatus,#fileuploadfailed,#fileuploadcancel { display : none; }
12-
</style>
1310
[% INCLUDE 'doc-head-close.inc' %]
1411
</head>
1512
<body id="admin_marc_order_acct" class="admin">
@@ -137,19 +134,59 @@ MARC Order Accounts
137134
<li>
138135
<label for='record_type'>Record type:</label>
139136
<select name='record_type' id='record_type'>
140-
<option value='biblio' selected='selected'>Bibliographic</option>
141-
<option value='auth'>Authority</option>
137+
[% IF ( account.record_type == 'biblio' ) %]
138+
<option value="biblio" selected="selected">
139+
[% ELSE %]
140+
<option value="biblio">
141+
[% END %]
142+
Bibliographic</option>
143+
[% IF ( account.record_type == 'auth' ) %]
144+
<option value="auth" selected="selected">
145+
[% ELSE %]
146+
<option value="auth">
147+
[% END %]
148+
Authority</option>
142149
</select>
143150
</li>
144151
<li>
145152
<label for="encoding">Character encoding: </label>
146153
<select name="encoding" id="encoding">
147-
<option value="UTF-8" selected="selected">UTF-8 (Default)</option>
148-
<option value="MARC-8">MARC 8</option>
149-
<option value="ISO_5426">ISO 5426</option>
150-
<option value="ISO_6937">ISO 6937</option>
151-
<option value="ISO_8859-1">ISO 8859-1</option>
152-
<option value="EUC-KR">EUC-KR</option>
154+
[% IF ( account.encoding == 'UTF-8' ) %]
155+
<option value="UTF-8" selected="selected">
156+
[% ELSE %]
157+
<option value="UTF-8">
158+
[% END %]
159+
UTF-8 (Default)</option>
160+
[% IF ( account.encoding == 'MARC-8' ) %]
161+
<option value="MARC-8" selected="selected">
162+
[% ELSE %]
163+
<option value="MARC-8">
164+
[% END %]
165+
MARC 8</option>
166+
[% IF ( account.encoding == 'ISO_5426' ) %]
167+
<option value="ISO_5426" selected="selected">
168+
[% ELSE %]
169+
<option value="ISO_5426">
170+
[% END %]
171+
ISO 5426</option>
172+
[% IF ( account.encoding == 'ISO_6937' ) %]
173+
<option value="ISO_6937" selected="selected">
174+
[% ELSE %]
175+
<option value="ISO_6937">
176+
[% END %]
177+
ISO 6937</option>
178+
[% IF ( account.encoding == 'ISO_8859-1' ) %]
179+
<option value="ISO_8859-1" selected="selected">
180+
[% ELSE %]
181+
<option value="ISO_8859-1">
182+
[% END %]
183+
ISO 8859-1</option>
184+
[% IF ( account.encoding == 'EUC-KR' ) %]
185+
<option value="EUC-KR" selected="selected">
186+
[% ELSE %]
187+
<option value="EUC-KR">
188+
[% END %]
189+
EUC-KR</option>
153190
</select>
154191
</li>
155192
</ol>
@@ -161,7 +198,7 @@ MARC Order Accounts
161198
<label for="matcher">Record matching rule:</label>
162199
<select name="matcher" id="matcher">
163200
[% FOREACH available_matcher IN available_matchers %]
164-
[% IF available_matcher.id == account.matcher_id %]
201+
[% IF available_matcher.matcher_id == account.matcher_id %]
165202
<option value="[% available_matcher.matcher_id | html %]" selected="selected">[% available_matcher.code | html %] ([% available_matcher.description | html %])</option>
166203
[% ELSE %]
167204
<option value="[% available_matcher.matcher_id | html %]">[% available_matcher.code | html %] ([% available_matcher.description | html %])</option>
@@ -171,29 +208,101 @@ MARC Order Accounts
171208
</li>
172209
<li>
173210
<label for="overlay_action">Action if matching record found: </label>
174-
[% INCLUDE 'tools-overlay-action.inc' %]
211+
<select name="overlay_action" id="overlay_action">
212+
[% IF ( account.overlay_action == 'replace' ) %]
213+
<option value="replace" selected="selected">
214+
[% ELSE %]
215+
<option value="replace">
216+
[% END %]
217+
Replace existing record with incoming record</option>
218+
[% IF ( account.overlay_action == 'create_new' ) %]
219+
<option value="create_new" selected="selected">
220+
[% ELSE %]
221+
<option value="create_new">
222+
[% END %]
223+
Add incoming record</option>
224+
[% IF ( account.overlay_action == 'ignore' ) %]
225+
<option value="ignore" selected="selected">
226+
[% ELSE %]
227+
<option value="ignore">
228+
[% END %]
229+
Ignore incoming record (its items may still be processed)</option>
230+
</select>
175231
</li>
176232
<li>
177233
<label for="nomatch_action">Action if no match is found: </label>
178-
[% INCLUDE 'tools-nomatch-action.inc' %]
234+
<select name="nomatch_action" id="nomatch_action">
235+
[% IF ( account.nomatch_action == 'create_new' ) %]
236+
<option value="create_new" selected="selected">
237+
[% ELSE %]
238+
<option value="create_new">
239+
[% END %]
240+
Add incoming record</option>
241+
[% IF ( account.nomatch_action == 'ignore' ) %]
242+
<option value="ignore" selected="selected">
243+
[% ELSE %]
244+
<option value="ignore">
245+
[% END %]
246+
Ignore incoming record</option>
247+
</select>
179248
</li>
180249
</ol>
181250
</fieldset>
182251
<fieldset class="rows" id="items">
183252
<legend>Check for embedded item record data?</legend>
184253
<ol>
185254
<li class="radio">
186-
<input type="radio" id="parse_itemsyes" name="parse_items" value="1" checked="checked" />
255+
[% IF ( account.parse_items == 1 ) %]
256+
<input type="radio" id="parse_itemsyes" name="parse_items" value="1" checked="checked" />
257+
[% ELSE %]
258+
<input type="radio" id="parse_itemsyes" name="parse_items" value="1" />
259+
[% END %]
187260
<label for="parse_itemsyes">Yes</label>
188261
</li>
189262
<li class="radio">
190-
<input type="radio" id="parse_itemsno" name="parse_items" value="0" />
263+
[% IF ( account.parse_items == 0 ) %]
264+
<input type="radio" id="parse_itemsno" name="parse_items" value="0" checked="checked" />
265+
[% ELSE %]
266+
<input type="radio" id="parse_itemsno" name="parse_items" value="0" />
267+
[% END %]
191268
<label for="parse_itemsno">No</label>
192269
</li>
193270
</ol>
194271
<ol>
195-
<li><label for="item_action">How to process items: </label>
196-
[% INCLUDE 'tools-item-action.inc' %]
272+
<li>
273+
<label for="item_action">How to process items: </label>
274+
<select name="item_action" id="item_action">
275+
[% IF ( account.item_action == 'always_add' ) %]
276+
<option value="always_add" selected="selected">
277+
[% ELSE %]
278+
<option value="always_add">
279+
[% END %]
280+
Always add items</option>
281+
[% IF ( account.item_action == 'add_only_for_matches' ) %]
282+
<option value="add_only_for_matches" selected="selected">
283+
[% ELSE %]
284+
<option value="add_only_for_matches">
285+
[% END %]
286+
Add items only if matching bib was found</option>
287+
[% IF ( account.item_action == 'add_only_for_new' ) %]
288+
<option value="add_only_for_new" selected="selected">
289+
[% ELSE %]
290+
<option value="add_only_for_new">
291+
[% END %]
292+
Add items only if no matching bib was found</option>
293+
[% IF ( account.item_action == 'replace' ) %]
294+
<option value="replace" selected="selected">
295+
[% ELSE %]
296+
<option value="replace">
297+
[% END %]
298+
Replace items if matching bib was found (only for existing items)</option>
299+
[% IF ( account.item_action == 'ignore' ) %]
300+
<option value="ignore" selected="selected">
301+
[% ELSE %]
302+
<option value="ignore">
303+
[% END %]
304+
Ignore items</option>
305+
</select>
197306
</li>
198307
</ol>
199308
</fieldset>

0 commit comments

Comments
 (0)