Attachment #141720 for bug #24606

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




my $template_id = $input->param('template_id') || $input->cookie('ItemEditorSessionTemplateId');
if ( $delete_template_submit ) {
    my $t = Koha::Item::Templates->find($template_id);
    $t->delete if $t && ( $t->borrowernumber eq $loggedinuser || haspermission( $uid, { 'editcatalogue' => 'manage_item_editor_templates' } ) );
    $template_id = undef;
    $use_template_for_session = undef;
}


        if ($replace_template_id) {
            my $template = Koha::Item::Templates->find($replace_template_id);
            $template->update(
                {
                    id             => $replace_template_id,
                    is_shared      => $template_is_shared ? 1 : 0,
                    contents       => $item->unblessed,
                }
            ) if $template && (
                $template->borrowernumber eq $loggedinuser
                ||
                haspermission( $uid, { 'editcatalogue' => 'manage_item_editor_templates' } )
            );
        }
        else {
            my $template = Koha::Item::Template->new(

Lines 19-24 return { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_24606.pl (+5 lines)
19	CONSTRAINT `bn` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE	19	CONSTRAINT `bn` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE
20	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;	20	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
21	});	21	});
		22
		23	$dbh->do(q{
		24	INSERT IGNORE INTO permissions (module_bit, code, description) VALUES
		25	( 9, 'manage_item_editor_templates', 'Update and delete item editor template owned by others');
		26	});
22	}	27	}
23	},	28	},
24	};	29	};

Lines 353-358 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+5 lines)
353	Create, update and delete item groups, add or remove items from an item group	353	Create, update and delete item groups, add or remove items from an item group
354	</span>	354	</span>
355	<span class="permissioncode">([% name \| html %])</span>	355	<span class="permissioncode">([% name \| html %])</span>
		356	[%- CASE 'manage_item_editor_templates' -%]
		357	<span class="sub_permission manage_item_editor_templates_subpermission">
		358	Create, update and delete item editor templates owned by others
		359	</span>
		360	<span class="permissioncode">([% name \| html %])</span>
356	[%- CASE 'remaining_permissions' -%]	361	[%- CASE 'remaining_permissions' -%]
357	<span class="sub_permission remaining_permissions_subpermission">	362	<span class="sub_permission remaining_permissions_subpermission">
358	Remaining permissions for managing fines and fees	363	Remaining permissions for managing fines and fees

Lines 165-182 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-7 / +22 lines)
165	<optgroup label="My templates">	165	<optgroup label="My templates">
166	[% FOREACH t IN item_templates.owned %]	166	[% FOREACH t IN item_templates.owned %]
167	[% IF t.id == template_id %]	167	[% IF t.id == template_id %]
168	<option data-owner="1" value="[% t.id \| html %]" selected="selected">[% t.name \| html %][% IF t.is_shared %] (shared)[% END %]</option>	168	<option data-editor="1" value="[% t.id \| html %]" selected="selected">[% t.name \| html %][% IF t.is_shared %] (shared)[% END %]</option>
169	[% ELSE %]	169	[% ELSE %]
170	<option data-owner="1" value="[% t.id \| html %]">[% t.name \| html %][% IF t.is_shared %] (shared)[% END %]</option>	170	<option data-editor="1" value="[% t.id \| html %]">[% t.name \| html %][% IF t.is_shared %] (shared)[% END %]</option>
171	[% END %]	171	[% END %]
172	[% END %]	172	[% END %]
173	</optgroup>	173	</optgroup>
174	<optgroup label="Shared templates">	174	<optgroup label="Shared templates">
175	[% FOREACH t IN item_templates.shared %]	175	[% FOREACH t IN item_templates.shared %]
176	[% IF t.id == template_id %]	176	[% IF t.id == template_id %]
177	<option data-owner="0" value="[% t.id \| html %]" selected="selected">[% t.name \| html %]</option>	177	[% IF CAN_user_editcatalogue_manage_item_editor_templates %]
		178	<option data-editor="1" value="[% t.id \| html %]" selected="selected">[% t.name \| html %]</option>
		179	[% ELSE %]
		180	<option data-editor="0" value="[% t.id \| html %]" selected="selected">[% t.name \| html %]</option>
		181	[% END %]
178	[% ELSE %]	182	[% ELSE %]
179	<option data-owner="0" value="[% t.id \| html %]">[% t.name \| html %]</option>	183	[% IF CAN_user_editcatalogue_manage_item_editor_templates %]
		184	<option data-editor="1" value="[% t.id \| html %]">[% t.name \| html %]</option>
		185	[% ELSE %]
		186	<option data-editor="0" value="[% t.id \| html %]">[% t.name \| html %]</option>
		187	[% END %]
180	[% END %]	188	[% END %]
181	[% END %]	189	[% END %]
182	</optgroup>	190	</optgroup>
Lines 258-267 Link Here
258	<fieldset id="save_as_template_span">	266	<fieldset id="save_as_template_span">
259	<legend>Save template</legend>	267	<legend>Save template</legend>
260	<select name="replace_template_id" id="replace_template_id" class="select2" style="width: 20em">	268	<select name="replace_template_id" id="replace_template_id" class="select2" style="width: 20em">
261	<option value="0" selected="selected">Save as new</option>	269	<option value="0" selected="selected">Save as new template</option>
262	<optgroup label="Update existing">	270	<optgroup label="Update existing template">
263	[% FOREACH t IN item_templates.owned %]	271	[% FOREACH t IN item_templates.owned %]
264	<option data-owner="1" value="[% t.id \| html %]">[% t.name \| html %][% IF t.is_shared %] (shared)[% END %]</option>	272	<option data-editor="1" value="[% t.id \| html %]">[% t.name \| html %][% IF t.is_shared %] (shared)[% END %]</option>
		273	[% END %]
		274	[% IF CAN_user_editcatalogue_manage_item_editor_templates && item_templates.shared.count %]
		275	<optgroup label="Update shared template">
		276	[% FOREACH t IN item_templates.shared %]
		277	<option data-editor="1" value="[% t.id \| html %]">[% t.name \| html %][% IF t.is_shared %] (shared)[% END %]</option>
		278	[% END %]
		279	</optgroup>
265	[% END %]	280	[% END %]
266	</optgroup>	281	</optgroup>
267	</select>	282	</select>

Lines 85-91 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js (-2 / +1 lines)
85	});	85	});
86		86
87	$("#template_id").on("change", function() {	87	$("#template_id").on("change", function() {
88	if ( $(this).find(":selected").data("owner") ) {	88	if ( $(this).find(":selected").data("editor") ) {
89	$("#delete_template_submit").removeAttr("disabled");	89	$("#delete_template_submit").removeAttr("disabled");
90	} else {	90	} else {
91	$("#delete_template_submit").attr("disabled", "disabled");	91	$("#delete_template_submit").attr("disabled", "disabled");
92	-

Return to bug 24606

Lines 185-191 my $use_template_for_session = $input->param('use_template_for_session') \|\| $inp Link Here

(-)a/cataloguing/additem.pl (-10 / +12 lines)
185	my $template_id = $input->param('template_id') \|\| $input->cookie('ItemEditorSessionTemplateId');	185	my $template_id = $input->param('template_id') \|\| $input->cookie('ItemEditorSessionTemplateId');
186	if ( $delete_template_submit ) {	186	if ( $delete_template_submit ) {
187	my $t = Koha::Item::Templates->find($template_id);	187	my $t = Koha::Item::Templates->find($template_id);
188	$t->delete if $t && $t->borrowernumber eq $loggedinuser;	188	$t->delete if $t && ( $t->borrowernumber eq $loggedinuser \|\| haspermission( $uid, { 'editcatalogue' => 'manage_item_editor_templates' } ) );
189	$template_id = undef;	189	$template_id = undef;
190	$use_template_for_session = undef;	190	$use_template_for_session = undef;
191	}	191	}
Lines 275-289 if ($op eq "additem") { Link Here
275		275
276	if ($replace_template_id) {	276	if ($replace_template_id) {
277	my $template = Koha::Item::Templates->find($replace_template_id);	277	my $template = Koha::Item::Templates->find($replace_template_id);
278	if ($template) {	278	$template->update(
279	$template->update(	279	{
280	{	280	id => $replace_template_id,
281	id => $replace_template_id,	281	is_shared => $template_is_shared ? 1 : 0,
282	is_shared => $template_is_shared ? 1 : 0,	282	contents => $item->unblessed,
283	contents => $item->unblessed,	283	}
284	}	284	) if $template && (
285	);	285	$template->borrowernumber eq $loggedinuser
286	}	286	\|\|
		287	haspermission( $uid, { 'editcatalogue' => 'manage_item_editor_templates' } )
		288	);
287	}	289	}
288	else {	290	else {
289	my $template = Koha::Item::Template->new(	291	my $template = Koha::Item::Template->new(