Attachment #98656 for bug #11815

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




$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
    my ( $BorrowersTitles ) = $dbh->selectrow_array( q|
        SELECT value FROM systempreferences WHERE variable='BorrowersTitles';
    |);
    if( $BorrowersTitles ){
        $dbh->do("
            INSERT INTO authorised_value_categories( category_name ) VALUES ('PATRON_TITLE')
        ");
        my @titles;
        push @titles, split ('\|', $BorrowersTitles);
        my $sth = $dbh->prepare("
            INSERT INTO authorised_values(category, authorised_value, lib, lib_opac) VALUES ('PATRON_TITLE', ?, ?, ?)
        ");
        foreach my $patron_title ( @titles ) {
            $sth->execute( $patron_title, $patron_title, $patron_title );
        }
    }
    # Remove the BorrowersTitles system preference
    $dbh->do("DELETE FROM systempreferences WHERE variable='BorrowersTitles'");
    SetVersion ($DBversion);
    print "Upgrade to $DBversion done (Bug 11815: convert BorrowersTitles to an authorised value)\n";
}

Lines 101-107 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 lines)
101	('borrowerRelationship','father\|mother','','Define valid relationships between a guarantor & a guarantee (separated by \| or ,)','free'),	101	('borrowerRelationship','father\|mother','','Define valid relationships between a guarantor & a guarantee (separated by \| or ,)','free'),
102	('BorrowerRenewalPeriodBase','now','dateexpiry\|now\|combination','Set whether the borrower renewal date should be counted from the dateexpiry, from the current date or by combination: if the dateexpiry is in future use dateexpiry, else use current date ','Choice'),	102	('BorrowerRenewalPeriodBase','now','dateexpiry\|now\|combination','Set whether the borrower renewal date should be counted from the dateexpiry, from the current date or by combination: if the dateexpiry is in future use dateexpiry, else use current date ','Choice'),
103	('BorrowersLog','1',NULL,'If ON, log edit/create/delete actions on patron data','YesNo'),	103	('BorrowersLog','1',NULL,'If ON, log edit/create/delete actions on patron data','YesNo'),
104	('BorrowersTitles','Mr\|Mrs\|Miss\|Ms',NULL,'Define appropriate Titles for patrons','free'),
105	('BorrowerUnwantedField','',NULL,'Name the fields you don\'t need to store for a patron\'s account','free'),	104	('BorrowerUnwantedField','',NULL,'Name the fields you don\'t need to store for a patron\'s account','free'),
106	('BranchTransferLimitsType','ccode','itemtype\|ccode','When using branch transfer limits, choose whether to limit by itemtype or collection code.','Choice'),	105	('BranchTransferLimitsType','ccode','itemtype\|ccode','When using branch transfer limits, choose whether to limit by itemtype or collection code.','Choice'),
107	('BrowseResultSelection','0',NULL,'Enable/Disable browsing search results fromt the bibliographic record detail page in staff client','YesNo'),	106	('BrowseResultSelection','0',NULL,'Enable/Disable browsing search results fromt the bibliographic record detail page in staff client','YesNo'),

Lines 390-395 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt (+2 lines)
390	<p>A list of reasons displayed in the suggestion form on the OPAC.</p>	390	<p>A list of reasons displayed in the suggestion form on the OPAC.</p>
391	[% CASE 'ORDER_CANCELLATION_REASON' %]	391	[% CASE 'ORDER_CANCELLATION_REASON' %]
392	<p>Reasons why an order might have been cancelled</p>	392	<p>Reasons why an order might have been cancelled</p>
		393	[% CASE 'PATRON_TITLE' %]
		394	<p>Titles or honorifics which can be added to a patron record</p>
393	[% CASE 'PAYMENT_TYPE' %]	395	[% CASE 'PAYMENT_TYPE' %]
394	<p>Populates a dropdown list of custom payment types when paying fines</p>	396	<p>Populates a dropdown list of custom payment types when paying fines</p>
395	[% CASE 'qualif' %]	397	[% CASE 'qualif' %]

Lines 53-63 Patrons: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-5 lines)
53	class: multi	53	class: multi
54	- (input multiple choices separated by \|). Leave empty to deactivate	54	- (input multiple choices separated by \|). Leave empty to deactivate
55	-	55	-
56	- "Borrowers can have the following titles:"
57	- pref: BorrowersTitles
58	class: multi
59	- (separate multiple choices with \|)
60	-
61	- pref: CheckPrevCheckout	56	- pref: CheckPrevCheckout
62	default: no	57	default: no
63	choices:	58	choices:




                                        <ol>
                                            [% UNLESS ( I ) %]
                                                [% UNLESS notitle %]
                                                    [% IF ( patron_titles ) %]
                                                        <li>
                                                            [% IF ( mandatorytitle ) %]
                                                                <label for="btitle" class="required">

                                                            Salutation: </label>
                                                            <select id="btitle" name="title">
                                                                <option value=""></option>
                                                                    [% FOREACH ptitle IN patron_titles %]
                                                                        <option value="[% ptitle.lib | html %]" selected="selected">[% ptitle.lib | html %]</option>
                                                                        <option value="[% t | html %]" selected="selected">[% t | html %]</option>
                                                                    [% ELSE %]
                                                                        <option value="[% ptitle.lib | html %]">[% ptitle.lib | html %]</option>
                                                                    [% END %]
                                                                [% END %]
                                                            </select>




                                <legend id="identity_legend">Identity</legend>

                                <ol>
                                    [% UNLESS hidden.defined('title') || !patron_titles %]
                                        <li>
                                            [% IF mandatory.defined('title') %]
                                                <label for="borrower_title" class="required">Salutation:</label>


                                            <select id="borrower_title" name="borrower_title">
                                                <option value=""></option>
                                                [% FOREACH ptitle IN patron_titles %]
                                                    [% IF borrower.title == ptitle.lib %]
                                                        <option value="[% ptitle.lib | html %]" selected="selected">[% ptitle.lib | html %]</option>
                                                    [% ELSE %]
                                                        <option value="[% ptitle.lib | html %]">[% ptitle.lib | html %]</option>
                                                    [% END %]
                                                [% END %]
                                            </select>

Lines 654-662 $template->param( Link Here

(-)a/members/memberentry.pl (+3 lines)
654		654
655	my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );	655	my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
656	my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );	656	my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
		657	my $patron_titles = C4::Koha::GetAuthorisedValues( 'PATRON_TITLE' );
		658
657	$template->param(	659	$template->param(
658	roadtypes => $roadtypes,	660	roadtypes => $roadtypes,
659	cities => $cities,	661	cities => $cities,
		662	patron_titles => $patron_titles,
660	);	663	);
661		664
662	my $default_borrowertitle = '';	665	my $default_borrowertitle = '';




use C4::Members;
use C4::Members::Attributes qw( GetBorrowerAttributes );
use C4::Form::MessagingPreferences;
use Koha::AuthorisedValues;
use Koha::AuthUtils;
use Koha::Patrons;
use Koha::Patron::Consent;

}

my $mandatory = GetMandatoryFields($action);
my $patron_titles = C4::Koha::GetAuthorisedValues( 'PATRON_TITLE' );

my @libraries = Koha::Libraries->search;
if ( my @libraries_to_display = split '\|', C4::Context->preference('PatronSelfRegistrationLibraryList') ) {

    mandatory         => $mandatory,
    libraries         => \@libraries,
    OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),
    patron_titles     => $patron_titles,
);

my $attributes = ParsePatronAttributes($borrowernumber,$cgi);
- 

Return to bug 11815

Lines 240-246 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-5 / +4 lines)
240	<ol>	240	<ol>
241	[% UNLESS ( I ) %]	241	[% UNLESS ( I ) %]
242	[% UNLESS notitle %]	242	[% UNLESS notitle %]
243	[% IF Koha.Preference('BorrowersTitles') %]	243	[% IF ( patron_titles ) %]
244	<li>	244	<li>
245	[% IF ( mandatorytitle ) %]	245	[% IF ( mandatorytitle ) %]
246	<label for="btitle" class="required">	246	<label for="btitle" class="required">
Lines 250-260 Link Here
250	Salutation: </label>	250	Salutation: </label>
251	<select id="btitle" name="title">	251	<select id="btitle" name="title">
252	<option value=""></option>	252	<option value=""></option>
253	[% FOREACH t IN Koha.Preference('BorrowersTitles').split('\\|') %]	253	[% FOREACH ptitle IN patron_titles %]
254	[% IF btitle == t %]	254	<option value="[% ptitle.lib \| html %]" selected="selected">[% ptitle.lib \| html %]</option>
255	<option value="[% t \| html %]" selected="selected">[% t \| html %]</option>
256	[% ELSE %]	255	[% ELSE %]
257	<option value="[% t \| html %]">[% t \| html %]</option>	256	<option value="[% ptitle.lib \| html %]">[% ptitle.lib \| html %]</option>
258	[% END %]	257	[% END %]
259	[% END %]	258	[% END %]
260	</select>	259	</select>

Lines 274-280 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-5 / +5 lines)
274	<legend id="identity_legend">Identity</legend>	274	<legend id="identity_legend">Identity</legend>
275		275
276	<ol>	276	<ol>
277	[% UNLESS hidden.defined('title') \|\| !Koha.Preference('BorrowersTitles') %]	277	[% UNLESS hidden.defined('title') \|\| !patron_titles %]
278	<li>	278	<li>
279	[% IF mandatory.defined('title') %]	279	[% IF mandatory.defined('title') %]
280	<label for="borrower_title" class="required">Salutation:</label>	280	<label for="borrower_title" class="required">Salutation:</label>
Lines 284-294 Link Here
284		284
285	<select id="borrower_title" name="borrower_title">	285	<select id="borrower_title" name="borrower_title">
286	<option value=""></option>	286	<option value=""></option>
287	[% FOREACH mt IN Koha.Preference('BorrowersTitles').split('\\|') %]	287	[% FOREACH ptitle IN patron_titles %]
288	[% IF mt == borrower.title %]	288	[% IF borrower.title == ptitle.lib %]
289	<option value="[% mt \| html %]" selected="selected">[% mt \| html %]</option>	289	<option value="[% ptitle.lib \| html %]" selected="selected">[% ptitle.lib \| html %]</option>
290	[% ELSE %]	290	[% ELSE %]
291	<option value="[% mt \| html %]">[% mt \| html %]</option>	291	<option value="[% ptitle.lib \| html %]">[% ptitle.lib \| html %]</option>
292	[% END %]	292	[% END %]
293	[% END %]	293	[% END %]
294	</select>	294	</select>

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_11815-convert-borrowertitle-to-authval.perl (+23 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	my ( $BorrowersTitles ) = $dbh->selectrow_array( q\|
	4	SELECT value FROM systempreferences WHERE variable='BorrowersTitles';
	5	\|);
	6	if( $BorrowersTitles ){
	7	$dbh->do("
	8	INSERT INTO authorised_value_categories( category_name ) VALUES ('PATRON_TITLE')
	9	");
	10	my @titles;
	11	push @titles, split ('\\|', $BorrowersTitles);
	12	my $sth = $dbh->prepare("
	13	INSERT INTO authorised_values(category, authorised_value, lib, lib_opac) VALUES ('PATRON_TITLE', ?, ?, ?)
	14	");
	15	foreach my $patron_title ( @titles ) {
	16	$sth->execute( $patron_title, $patron_title, $patron_title );
	17	}
	18	}
	19	# Remove the BorrowersTitles system preference
	20	$dbh->do("DELETE FROM systempreferences WHERE variable='BorrowersTitles'");
	21	SetVersion ($DBversion);
	22	print "Upgrade to $DBversion done (Bug 11815: convert BorrowersTitles to an authorised value)\n";
	23	}

Lines 28-33 use C4::Output; Link Here

(-)a/opac/opac-memberentry.pl (-1 / +3 lines)
28	use C4::Members;	28	use C4::Members;
29	use C4::Members::Attributes qw( GetBorrowerAttributes );	29	use C4::Members::Attributes qw( GetBorrowerAttributes );
30	use C4::Form::MessagingPreferences;	30	use C4::Form::MessagingPreferences;
		31	use Koha::AuthorisedValues;
31	use Koha::AuthUtils;	32	use Koha::AuthUtils;
32	use Koha::Patrons;	33	use Koha::Patrons;
33	use Koha::Patron::Consent;	34	use Koha::Patron::Consent;
Lines 74-79 if ( $action eq q{} ) { Link Here
74	}	75	}
75		76
76	my $mandatory = GetMandatoryFields($action);	77	my $mandatory = GetMandatoryFields($action);
		78	my $patron_titles = C4::Koha::GetAuthorisedValues( 'PATRON_TITLE' );
77		79
78	my @libraries = Koha::Libraries->search;	80	my @libraries = Koha::Libraries->search;
79	if ( my @libraries_to_display = split '\\|', C4::Context->preference('PatronSelfRegistrationLibraryList') ) {	81	if ( my @libraries_to_display = split '\\|', C4::Context->preference('PatronSelfRegistrationLibraryList') ) {
Lines 93-98 $template->param( Link Here
93	mandatory => $mandatory,	95	mandatory => $mandatory,
94	libraries => \@libraries,	96	libraries => \@libraries,
95	OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),	97	OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),
		98	patron_titles => $patron_titles,
96	);	99	);
97		100
98	my $attributes = ParsePatronAttributes($borrowernumber,$cgi);	101	my $attributes = ParsePatronAttributes($borrowernumber,$cgi);
99	-