Attachment #167850 for bug #37116

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

Lines 9-19 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/edit_serial_issues.inc (-3 / +15 lines)
9	<h4 class="modal-title" id="edit-serial-issues-modal-label">Edit serial issues</h4>	9	<h4 class="modal-title" id="edit-serial-issues-modal-label">Edit serial issues</h4>
10	</div>	10	</div>
11	<div class="modal-body">	11	<div class="modal-body">
12	<h5 style="margin-bottom: 15px;">This item has a serial issue linked to it, would you like to edit this as well?</h5>	12	[% IF batch %]
		13	<h5 style="margin-bottom: 15px;">Some of these items have linked serial issues, would you like to edit these as well?</h5>
		14	[% ELSE %]
		15	<h5 style="margin-bottom: 15px;">This item has a serial issue linked to it, would you like to edit this as well?</h5>
		16	[% END %]
13	</div>	17	</div>
14	<div class="modal-footer">	18	<div class="modal-footer">
15	<button id="edit-serial-issues-modal-btn-submit" type="button" class="btn btn-primary"><i class="fa fa-exclamation-circle"></i> Edit serial issue</button>	19	[% IF batch %]
16	<button id="no-edit-serial-issues-modal-btn-submit" class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Save item without editing serial issue</button>	20	<button id="edit-serial-issues-modal-btn-submit" type="button" class="btn btn-primary"><i class="fa fa-exclamation-circle"></i> Edit serial issues</button>
		21	[% ELSE %]
		22	<button id="edit-serial-issues-modal-btn-submit" type="button" class="btn btn-primary"><i class="fa fa-exclamation-circle"></i> Edit serial issue</button>
		23	[% END %]
		24	[% IF batch %]
		25	<button id="no-edit-serial-issues-modal-btn-submit" class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Save items without editing serial issues</button>
		26	[% ELSE %]
		27	<button id="no-edit-serial-issues-modal-btn-submit" class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Save item without editing serial issue</button>
		28	[% END %]
17	</div>	29	</div>
18	</div>	30	</div>
19	</div>	31	</div>

Lines 162-167 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt (-1 / +10 lines)
162	<input type="hidden" name="searchid" value="[% searchid \| html %]" />	162	<input type="hidden" name="searchid" value="[% searchid \| html %]" />
163	<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />	163	<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
164	<input type="hidden" name="src" id="src" value="[% src \| html %]" />	164	<input type="hidden" name="src" id="src" value="[% src \| html %]" />
		165	[% FOREACH linked_serial_id IN linked_serial_ids %]
		166	<input type="hidden" name="linked_serial_id" id="linked_serial_id" value="[% linked_serial_id \| html %]" />
		167	[% END %]
165	[% IF biblionumber %]	168	[% IF biblionumber %]
166	<input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber \| html %]" />	169	<input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber \| html %]" />
167	[% END %]	170	[% END %]
Lines 237-243 Link Here
237	</fieldset>	240	</fieldset>
238		241
239	<fieldset class="action">	242	<fieldset class="action">
240	<input type="submit" id="mainformsubmit" class="btn btn-primary" value="Save" />	243	[% IF linked_serials %]
		244	<input type="button" class="submit" value="Save" onclick="return ShowSerialEditingConfirmation(this.form)">
		245	<input type="hidden" name="edit-serial-issues" id="edit-serial-issues" value />
		246	[% ELSE %]
		247	<input type="submit" id="mainformsubmit" class="btn btn-primary" value="Save" />
		248	[% END %]
241	<a href="/cgi-bin/koha/tools/batchMod.pl" class="cancel">Cancel</a>	249	<a href="/cgi-bin/koha/tools/batchMod.pl" class="cancel">Cancel</a>
242	</fieldset>	250	</fieldset>
243	</div> <!-- /#cataloguing_additem_newitem -->	251	</div> <!-- /#cataloguing_additem_newitem -->
Lines 260-265 Link Here
260	</fieldset> <!-- /.action -->	268	</fieldset> <!-- /.action -->
261	[% END %]	269	[% END %]
262	</form>	270	</form>
		271	[% INCLUDE 'modals/edit_serial_issues.inc' batch=1 %]
263		272
264	[% MACRO jsinclude BLOCK %]	273	[% MACRO jsinclude BLOCK %]
265	[% Asset.js("lib/jquery/plugins/humanmsg.js") \| $raw %]	274	[% Asset.js("lib/jquery/plugins/humanmsg.js") \| $raw %]

Lines 116-121 function hideAllColumns() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/batchMod.js (+16 lines)
116	Cookies.set("showColumns", cookieString, { expires: date, path: '/', sameSite: 'Lax' });	116	Cookies.set("showColumns", cookieString, { expires: date, path: '/', sameSite: 'Lax' });
117	}	117	}
118		118
		119	function ShowSerialEditingConfirmation(form) {
		120	$('#edit-serial-issues-modal').modal();
		121	return false;
		122	}
		123
119	$(document).ready(function () {	124	$(document).ready(function () {
120	var items_table = KohaTable("itemst", {	125	var items_table = KohaTable("itemst", {
121	"columnDefs": [	126	"columnDefs": [
Lines 165-168 $(document).ready(function () { Link Here
165	}	170	}
166	}	171	}
167	});	172	});
		173	$(document).on('click', '#edit-serial-issues-modal-btn-submit', function (e) {
		174	e.preventDefault();
		175	$('#edit-serial-issues-modal').modal('hide');
		176	$('#edit-serial-issues').val('1');
		177	return $("form[name='f'").submit();
		178	});
		179	$(document).on('click', '#no-edit-serial-issues-modal-btn-submit', function (e) {
		180	e.preventDefault();
		181	$('#edit-serial-issues-modal').modal('hide');
		182	return $("form[name='f'").submit();
		183	});
168	});	184	});

Lines 182-191 if ( $op eq "cud-action" ) { Link Here

(-)a/tools/batchMod.pl (-5 / +23 lines)
182		182
183	};	183	};
184	try {	184	try {
185	my $job_id =	185	# my $job_id =
186	Koha::BackgroundJob::BatchUpdateItem->new->enqueue($params);	186	# Koha::BackgroundJob::BatchUpdateItem->new->enqueue($params);
187	$nextop = 'enqueued';	187	# $nextop = 'enqueued';
188	$template->param( job_id => $job_id, );	188	# $template->param( job_id => $job_id, );
		189
		190	if ( $input->param('edit-serial-issues') ) {
		191	my @linked_serial_ids = $input->multi_param('linked_serial_id');
		192	my $redirect_url = "/cgi-bin/koha/serials/serials-edit.pl?";
		193	for my $serial_id (@linked_serial_ids) {
		194	$redirect_url .= "serialid=$serial_id&";
		195	}
		196	print $input->redirect($redirect_url);
		197	exit;
		198	}
189	}	199	}
190	catch {	200	catch {
191	push @messages,	201	push @messages,
Lines 269-274 if ($op eq "cud-show" \|\| $op eq "show"){ Link Here
269	$template->param(itemnumbers_array => \@itemnumbers);	279	$template->param(itemnumbers_array => \@itemnumbers);
270	}	280	}
271		281
		282	my @linked_serial_ids;
		283	foreach my $itemnumber (@itemnumbers) {
		284	my $item = Koha::Items->find($itemnumber);
		285	my $serialid = $item->serial_item->serialid;
		286	push( @linked_serial_ids, $serialid ) if $serialid;
		287	}
		288	$template->param( linked_serial_ids => \@linked_serial_ids );
		289	$template->param( linked_serials => 1 ) if scalar(@linked_serial_ids) > 0;
		290
272	# now, build the item form for entering a new item	291	# now, build the item form for entering a new item
273		292
274	# Getting list of subfields to keep when restricted batchmod edit is enabled	293	# Getting list of subfields to keep when restricted batchmod edit is enabled
275	-

Return to bug 37116