Attachment #71227 for bug #18818

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

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_18818_quick_add_patron_category_list.sql (+1 lines)
	1	ALTER TABLE `categories` ADD `quick_add_display` tinyint(1) NOT NULL DEFAULT 1 AFTER `checkprevcheckout`;

Lines 335-340 CREATE TABLE `categories` ( -- this table shows information related to Koha patr Link Here

(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
335	`BlockExpiredPatronOpacActions` tinyint(1) NOT NULL default '-1', -- wheither or not a patron of this category can renew books or place holds once their card has expired. 0 means they can, 1 means they cannot, -1 means use syspref BlockExpiredPatronOpacActions	335	`BlockExpiredPatronOpacActions` tinyint(1) NOT NULL default '-1', -- wheither or not a patron of this category can renew books or place holds once their card has expired. 0 means they can, 1 means they cannot, -1 means use syspref BlockExpiredPatronOpacActions
336	`default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category	336	`default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category
337	`checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron category if this item has previously been checked out to this patron if 'yes', not if 'no', defer to syspref setting if 'inherit'.	337	`checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron category if this item has previously been checked out to this patron if 'yes', not if 'no', defer to syspref setting if 'inherit'.
		338	`quick_add_display` tinyint(1) NOT NULL default 1; -- display or not category in quick add patron feature (1 for yes, 0 for no)
338	PRIMARY KEY (`categorycode`),	339	PRIMARY KEY (`categorycode`),
339	UNIQUE KEY `categorycode` (`categorycode`)	340	UNIQUE KEY `categorycode` (`categorycode`)
340	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;	341	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

Lines 14-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc (-1 / +5 lines)
14	<div class="btn-group">	14	<div class="btn-group">
15	<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>	15	<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
16	<ul class="dropdown-menu">	16	<ul class="dropdown-menu">
17	[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode %]&quickadd=true">[% category.description \|html %]</a></li>[% END %]	17	[% FOREACH category IN categories %]
		18	[% IF category.quick_add_display %]
		19	<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode %]&quickadd=true">[% category.description \|html %]</a></li>
		20	[% END %]
		21	[% END %]
18	</ul>	22	</ul>
19	</div>	23	</div>
20	[% END %]	24	[% END %]

Lines 210-215 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-1 / +14 lines)
210	</li>	210	</li>
211	[% END %]	211	[% END %]
212	<li>	212	<li>
		213	<label for="quick_add_display">Display in quick add patron list:</label>
		214	<select id=quick_add_display name=quick_add_display>
		215	<option value=1 [% UNLESS category.quick_add_display %]selected=selected [% END %]>Display</option>
		216	<option value=0 [% UNLESS category.quick_add_display %]selected=selected [% END %]>Don't Display</option>
		217	</select>
		218	</li>
		219	<li>
213	<label for="default_privacy">Default privacy: </label>	220	<label for="default_privacy">Default privacy: </label>
214	<select id="default_privacy" name="default_privacy">	221	<select id="default_privacy" name="default_privacy">
215	[% SET default_privacy = 'default' %]	222	[% SET default_privacy = 'default' %]
Lines 281-286 Link Here
281	<tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>	288	<tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>
282	<tr><th scope="row">Lost items in staff client</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>	289	<tr><th scope="row">Lost items in staff client</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>
283	<tr><th scope="row">Hold fee: </th><td>[% category.reservefee \| $Price %]</td></tr>	290	<tr><th scope="row">Hold fee: </th><td>[% category.reservefee \| $Price %]</td></tr>
		291	<tr><th scope="row">Display in Quick Add Patron</th>></tr>
284		292
285	[% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' \|\| Koha.Preference('CheckPrevCheckout') == 'softno' ) %]	293	[% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' \|\| Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
286	<tr>	294	<tr>
Lines 353-358 Link Here
353	<th scope="col">Messaging</th>	361	<th scope="col">Messaging</th>
354	[% END %]	362	[% END %]
355	<th scope="col">Branches limitations</th>	363	<th scope="col">Branches limitations</th>
		364	<th scope="col">Display in Quick Add Patron</th>
356	[% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' \|\| Koha.Preference('CheckPrevCheckout') == 'softno' ) %]	365	[% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' \|\| Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
357	<th scope="col">Check previous checkout?</th>	366	<th scope="col">Check previous checkout?</th>
358	[% END %]	367	[% END %]
Lines 461-466 Link Here
461	</td>	470	</td>
462	[% END %]	471	[% END %]
463	<td>	472	<td>
		473	[% IF category.quick_add_display %] Display
		474	[% ELSE %] Don't Display
		475	[% END %]
		476	</td>
		477	<td>
464	[% SWITCH category.default_privacy %]	478	[% SWITCH category.default_privacy %]
465	[% CASE 'default' %]	479	[% CASE 'default' %]
466	Default	480	Default
467	-

Return to bug 18818

Lines 92-97 elsif ( $op eq 'add_validate' ) { Link Here

(-)a/admin/categories.pl (+2 lines)
92	my $BlockExpiredPatronOpacActions = $input->param('BlockExpiredPatronOpacActions');	92	my $BlockExpiredPatronOpacActions = $input->param('BlockExpiredPatronOpacActions');
93	my $checkPrevCheckout = $input->param('checkprevcheckout');	93	my $checkPrevCheckout = $input->param('checkprevcheckout');
94	my $default_privacy = $input->param('default_privacy');	94	my $default_privacy = $input->param('default_privacy');
		95	my $quick_add_display = $input->param('quick_add_display');
95	my @branches = grep { $_ ne q{} } $input->multi_param('branches');	96	my @branches = grep { $_ ne q{} } $input->multi_param('branches');
96		97
97	my $is_a_modif = $input->param("is_a_modif");	98	my $is_a_modif = $input->param("is_a_modif");
Lines 121-126 elsif ( $op eq 'add_validate' ) { Link Here
121	$category->category_type($category_type);	122	$category->category_type($category_type);
122	$category->BlockExpiredPatronOpacActions($BlockExpiredPatronOpacActions);	123	$category->BlockExpiredPatronOpacActions($BlockExpiredPatronOpacActions);
123	$category->checkprevcheckout($checkPrevCheckout);	124	$category->checkprevcheckout($checkPrevCheckout);
		125	$category->quick_add_display($quick_add_display);
124	$category->default_privacy($default_privacy);	126	$category->default_privacy($default_privacy);
125	eval {	127	eval {
126	$category->store;	128	$category->store;