Bugzilla – Attachment 47171 Details for
Bug 8753
Add forgot password link to OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8753: [QA Follow-up] Primary key and collation
Bug-8753-QA-Follow-up-Primary-key-and-collation.patch (text/plain), 4.68 KB, created by
Marcel de Rooy
on 2016-01-22 09:48:38 UTC
(
hide
)
Description:
Bug 8753: [QA Follow-up] Primary key and collation
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2016-01-22 09:48:38 UTC
Size:
4.68 KB
patch
obsolete
>From 827f409c2ebf2569bda19777439ecb426e29b16f Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Fri, 22 Jan 2016 10:18:29 +0100 >Subject: [PATCH] Bug 8753: [QA Follow-up] Primary key and collation >Content-Type: text/plain; charset=utf-8 > >This patch includes: >[1] Adds primary key borrowernumber to new table. >[2] Fixes collation. >[3] Removes manual PK in DBIx schema file. >[4] Fixes typo CompletePasswordRevovery. >[5] Removes use strict from opac-password-recovery; Modern::Perl is used. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > C4/Passwordrecovery.pm | 2 +- > Koha/Schema/Result/BorrowerPasswordRecovery.pm | 17 ++++++++++++++--- > .../bug_8753-Add_forgot_password_link_to_OPAC.sql | 3 ++- > installer/data/mysql/kohastructure.sql | 3 ++- > opac/opac-password-recovery.pl | 1 - > 5 files changed, 19 insertions(+), 7 deletions(-) > >diff --git a/C4/Passwordrecovery.pm b/C4/Passwordrecovery.pm >index d8420db..ea01e15 100644 >--- a/C4/Passwordrecovery.pm >+++ b/C4/Passwordrecovery.pm >@@ -164,7 +164,7 @@ sub SendPasswordRecoveryEmail { > > =head2 CompletePasswordRecovery > >- $bool = CompletePasswordRevovery($uuid); >+ $bool = CompletePasswordRecovery($uuid); > > Deletes a password recovery entry. > >diff --git a/Koha/Schema/Result/BorrowerPasswordRecovery.pm b/Koha/Schema/Result/BorrowerPasswordRecovery.pm >index 85d6343..c7f567d 100644 >--- a/Koha/Schema/Result/BorrowerPasswordRecovery.pm >+++ b/Koha/Schema/Result/BorrowerPasswordRecovery.pm >@@ -57,12 +57,23 @@ __PACKAGE__->add_columns( > }, > ); > >+=head1 PRIMARY KEY > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-11-03 12:08:20 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ORAWxUHIkefSfPSqrcfeXA >+=over 4 > >+=item * L</borrowernumber> >+ >+=back >+ >+=cut > >-# You can replace this text with custom code or comments, and it will be preserved on regeneration > __PACKAGE__->set_primary_key("borrowernumber"); > >+ >+# Created by DBIx::Class::Schema::Loader v0.07025 @ 2016-01-22 10:16:52 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:c4ehAGqOD6YHpGg85BX8YQ >+ >+ >+# You can replace this text with custom code or comments, and it will be preserved on regeneration >+ > 1; >diff --git a/installer/data/mysql/atomicupdate/bug_8753-Add_forgot_password_link_to_OPAC.sql b/installer/data/mysql/atomicupdate/bug_8753-Add_forgot_password_link_to_OPAC.sql >index 9719bee..f47e562 100644 >--- a/installer/data/mysql/atomicupdate/bug_8753-Add_forgot_password_link_to_OPAC.sql >+++ b/installer/data/mysql/atomicupdate/bug_8753-Add_forgot_password_link_to_OPAC.sql >@@ -5,8 +5,9 @@ CREATE TABLE IF NOT EXISTS borrower_password_recovery ( > borrowernumber int(11) NOT NULL, > uuid varchar(128) NOT NULL, > valid_until timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, >+ PRIMARY KEY (borrowernumber), > KEY borrowernumber (borrowernumber) >-) ENGINE=InnoDB DEFAULT CHARSET=utf8; >+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; > > INSERT IGNORE INTO `letter` (module, code, branchcode, name, is_html, title, content, message_transport_type) > VALUES ('members','PASSWORD_RESET','','Online password reset',1,'Koha password recovery','<html>\r\n<p>This email has been sent in response to your password recovery request for the account <strong><<user>></strong>.\r\n</p>\r\n<p>\r\nYou can now create your new password using the following link:\r\n<br/><a href=\"<<passwordreseturl>>\"><<passwordreseturl>></a>\r\n</p>\r\n<p>This link will be valid for 2 days from this email\'s reception, then you must reapply if you do not change your password.</p>\r\n<p>Thank you.</p>\r\n</html>\r\n','email'); >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 3975f28..b98b017 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -365,8 +365,9 @@ CREATE TABLE IF NOT EXISTS `borrower_password_recovery` ( -- holds information a > `borrowernumber` int(11) NOT NULL, -- the user asking a password recovery > `uuid` varchar(128) NOT NULL, -- a unique string to identify a password recovery attempt > `valid_until` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, -- a time limit on the password recovery attempt >+ PRIMARY KEY (`borrowernumber`), > KEY borrowernumber (borrowernumber) >-) ENGINE=InnoDB DEFAULT CHARSET=utf8 >+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; > > -- > -- Table structure for table borrower_sync >diff --git a/opac/opac-password-recovery.pl b/opac/opac-password-recovery.pl >index 6cfc414..7e3eae2 100755 >--- a/opac/opac-password-recovery.pl >+++ b/opac/opac-password-recovery.pl >@@ -1,6 +1,5 @@ > #!/usr/bin/perl > >-use strict; > use Modern::Perl; > use CGI; > >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8753
:
21502
|
21512
|
21521
|
21849
|
22175
|
22430
|
24586
|
24780
|
24781
|
24846
|
24853
|
24854
|
24855
|
24862
|
24906
|
24907
|
24908
|
25038
|
25039
|
25051
|
29111
|
33175
|
33176
|
34472
|
36819
|
37492
|
39049
|
39144
|
39165
|
39166
|
39167
|
39168
|
39827
|
41181
|
41192
|
41193
|
41455
|
41686
|
41687
|
41688
|
41706
|
43017
|
43183
|
43576
|
44305
|
44306
|
44307
|
44308
|
44309
|
44310
|
44311
|
44323
|
44324
|
44325
|
44326
|
44327
|
44329
|
44330
|
45209
|
45210
|
45211
|
45212
|
45213
|
45214
|
45215
|
45223
|
45224
|
45225
|
45226
|
45227
|
45228
|
45229
|
45230
|
46379
|
47164
|
47165
|
47166
|
47167
|
47168
|
47169
|
47170
| 47171 |
47357
|
47366