Attachment #81433 for bug #21704

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




            mandatory => $data->{'mandatory'},
            authorised_value => $data->{authorised_value},
            ind1_defaultvalue => $data->{'ind1_defaultvalue'},
            ind2_defaultvalue => $data->{'ind2_defaultvalue'}
			frameworkcode => $frameworkcode,
    );  # FIXME: move checkboxes to presentation layer
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################

    my $data = $sth->fetchrow_hashref;
	$template->param(
         liblibrarian => $data->{'liblibrarian'},
          searchfield => $searchfield
        frameworkcode => $frameworkcode,
    );
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################

    $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
    $cache->clear_from_cache("default_value_for_mod_marc-");
    $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
	$template->param( searchfield => $searchfield );
          searchfield => $searchfield,
        frameworkcode => $frameworkcode,
    );
													# END $OP eq DELETE_CONFIRMED
################## ITEMTYPE_CREATE ##################################
# called automatically if an unexisting  frameworkis selected

            };
		}
	}
	$template->param( existingframeworkloop => \@existingframeworkloop );

					);
################## DEFAULT ##################################
} else { # DEFAULT
	# here, $op can be unset or set to "framework_create_confirm".

		$template->param(isprevpage => $offset,
						prevpage=> $offset-$pagesize,
						searchfield => $searchfield,
						script_name => $script_name
						frameworkcode => $frameworkcode,
		);
	}
	if ($offset+$pagesize<$cnt) {
		$template->param(nextpage =>$offset+$pagesize,
						searchfield => $searchfield,
						script_name => $script_name
						frameworkcode => $frameworkcode,
		);
	}
} #---- END $OP eq DEFAULT

Lines 131-137 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt (-2 / +1 lines)
131	<form action="[% script_name \| html %]" method="post">	131	<form action="[% script_name \| html %]" method="post">
132	<input type="hidden" name="op" value="framework_create_confirm" />	132	<input type="hidden" name="op" value="framework_create_confirm" />
133	<input type="hidden" name="frameworkcode" value="[% framework.frameworkcode \| html %]" />	133	<input type="hidden" name="frameworkcode" value="[% framework.frameworkcode \| html %]" />
134	Create framework for [% frameworkcode \| html %] ([% framework.frameworktext \| html %]) using	134	Create framework for [% framework.frameworkcode \| html %] ([% framework.frameworktext \| html %]) using
135	<select name="existingframeworkcode">	135	<select name="existingframeworkcode">
136	<option value="">Default</option>	136	<option value="">Default</option>
137	[% FOREACH existingframeworkloo IN existingframeworkloop %]	137	[% FOREACH existingframeworkloo IN existingframeworkloop %]
138	-

Return to bug 21704

Lines 109-116 if ($op eq 'add_form') { Link Here

(-)a/admin/marctagstructure.pl (-15 / +7 lines)
109	mandatory => $data->{'mandatory'},	109	mandatory => $data->{'mandatory'},
110	authorised_value => $data->{authorised_value},	110	authorised_value => $data->{authorised_value},
111	ind1_defaultvalue => $data->{'ind1_defaultvalue'},	111	ind1_defaultvalue => $data->{'ind1_defaultvalue'},
112	ind2_defaultvalue => $data->{'ind2_defaultvalue'},	112	ind2_defaultvalue => $data->{'ind2_defaultvalue'}
113	frameworkcode => $frameworkcode,
114	); # FIXME: move checkboxes to presentation layer	113	); # FIXME: move checkboxes to presentation layer
115	# END $OP eq ADD_FORM	114	# END $OP eq ADD_FORM
116	################## ADD_VALIDATE ##################################	115	################## ADD_VALIDATE ##################################
Lines 168-175 if ($op eq 'add_form') { Link Here
168	my $data = $sth->fetchrow_hashref;	167	my $data = $sth->fetchrow_hashref;
169	$template->param(	168	$template->param(
170	liblibrarian => $data->{'liblibrarian'},	169	liblibrarian => $data->{'liblibrarian'},
171	searchfield => $searchfield,	170	searchfield => $searchfield
172	frameworkcode => $frameworkcode,
173	);	171	);
174	# END $OP eq DELETE_CONFIRM	172	# END $OP eq DELETE_CONFIRM
175	################## DELETE_CONFIRMED ##################################	173	################## DELETE_CONFIRMED ##################################
Lines 183-192 if ($op eq 'add_form') { Link Here
183	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	181	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
184	$cache->clear_from_cache("default_value_for_mod_marc-");	182	$cache->clear_from_cache("default_value_for_mod_marc-");
185	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	183	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
186	$template->param(	184	$template->param( searchfield => $searchfield );
187	searchfield => $searchfield,
188	frameworkcode => $frameworkcode,
189	);
190	# END $OP eq DELETE_CONFIRMED	185	# END $OP eq DELETE_CONFIRMED
191	################## ITEMTYPE_CREATE ##################################	186	################## ITEMTYPE_CREATE ##################################
192	# called automatically if an unexisting frameworkis selected	187	# called automatically if an unexisting frameworkis selected
Lines 202-210 if ($op eq 'add_form') { Link Here
202	};	197	};
203	}	198	}
204	}	199	}
205	$template->param(existingframeworkloop => \@existingframeworkloop,	200	$template->param( existingframeworkloop => \@existingframeworkloop );
206	frameworkcode => $frameworkcode,	201
207	);
208	################## DEFAULT ##################################	202	################## DEFAULT ##################################
209	} else { # DEFAULT	203	} else { # DEFAULT
210	# here, $op can be unset or set to "framework_create_confirm".	204	# here, $op can be unset or set to "framework_create_confirm".
Lines 300-314 if ($op eq 'add_form') { Link Here
300	$template->param(isprevpage => $offset,	294	$template->param(isprevpage => $offset,
301	prevpage=> $offset-$pagesize,	295	prevpage=> $offset-$pagesize,
302	searchfield => $searchfield,	296	searchfield => $searchfield,
303	script_name => $script_name,	297	script_name => $script_name
304	frameworkcode => $frameworkcode,
305	);	298	);
306	}	299	}
307	if ($offset+$pagesize<$cnt) {	300	if ($offset+$pagesize<$cnt) {
308	$template->param(nextpage =>$offset+$pagesize,	301	$template->param(nextpage =>$offset+$pagesize,
309	searchfield => $searchfield,	302	searchfield => $searchfield,
310	script_name => $script_name,	303	script_name => $script_name
311	frameworkcode => $frameworkcode,
312	);	304	);
313	}	305	}
314	} #---- END $OP eq DEFAULT	306	} #---- END $OP eq DEFAULT