Attachment #102188 for bug #4461

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

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug-4461_add-OPACReportProblem-syspref.perl (+7 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	$dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACReportProblem', 0, NULL, 'Allow patrons to submit problem reports for OPAC pages to the library or Koha Administrator', 'YesNo') });
	4
	5	SetVersion( $DBversion );
	6	print "Upgrade to $DBversion done (Bug 4461 - Add OPACReportProblem system preference)\n";
	7	}




$DBversion = 'XXX';  # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
    $dbh->do(q{ DROP TABLE IF EXISTS `problem_reports` });

    $dbh->do(q{ CREATE TABLE problem_reports (
        reportid int(11) NOT NULL auto_increment, -- unqiue identifier assigned by Koha
        title varchar(40) NOT NULL default '', -- report subject line
        content varchar(255) NOT NULL default '', -- report message content
        borrowernumber int(11) default NULL, -- the user who created the problem report
        branchcode varchar(10) NOT NULL default '', -- borrower's branch
        username varchar(75) default NULL, -- OPAC username
        problempage varchar(255) default NULL, -- page the user triggered the problem report form from
        recipient enum('admin','library') NOT NULL default 'library', -- the 'to-address' of the problem report
        reportdate datetime default NULL, -- date and time of report submission
        status varchar(1) NOT NULL default 'N', -- status of the report. N=new, V=viewed, C=closed
        PRIMARY KEY (reportid),
        CONSTRAINT problem_reports_ibfk1 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
        CONSTRAINT problem_reports_ibfk2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci });

    SetVersion( $DBversion );
    print "Upgrade to $DBversion done (Bug 4461: Add problem reports table)\n";
}




    CONSTRAINT `rc_resolved_by_ibfk` FOREIGN KEY (`resolved_by`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

--
-- Table structure for table `problem_reports`
--

DROP TABLE IF EXISTS `problem_reports`;
CREATE TABLE `problem_reports` (
    `reportid` int(11) NOT NULL auto_increment, -- unqiue identifier assigned by Koha
    `title` varchar(40) NOT NULL default '', -- report subject line
    `content` varchar(255) NOT NULL default '', -- report message content
    `borrowernumber` int(11) default NULL, -- the user who created the problem report
    `branchcode` varchar(10) NOT NULL default '', -- borrower's branch
    `username` varchar(75) default NULL, -- OPAC username
    `problempage` varchar(255) default NULL, -- page the user triggered the problem report form from
    `recipient` enum('admin','library') NOT NULL default 'library', -- the 'to-address' of the problem report
    `reportdate` datetime default NULL, -- date and time of report submission
    `status` varchar(1) NOT NULL default 'N', -- status of the report. N=new, V=viewed, C=closed
    PRIMARY KEY (`reportid`),
    CONSTRAINT `problem_reports_ibfk1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
    CONSTRAINT `problem_reports_ibfk2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

Lines 424-429 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
424	('opacreadinghistory','1','','If ON, enables display of Patron Circulation History in OPAC','YesNo'),	424	('opacreadinghistory','1','','If ON, enables display of Patron Circulation History in OPAC','YesNo'),
425	('OpacRenewalAllowed','0',NULL,'If ON, users can renew their issues directly from their OPAC account','YesNo'),	425	('OpacRenewalAllowed','0',NULL,'If ON, users can renew their issues directly from their OPAC account','YesNo'),
426	('OpacRenewalBranch','checkoutbranch','itemhomebranch\|patronhomebranch\|checkoutbranch\|none','Choose how the branch for an OPAC renewal is recorded in statistics','Choice'),	426	('OpacRenewalBranch','checkoutbranch','itemhomebranch\|patronhomebranch\|checkoutbranch\|none','Choose how the branch for an OPAC renewal is recorded in statistics','Choice'),
		427	('OPACReportProblem', 0, NULL, 'Allow patrons to submit problem reports for OPAC pages to the library or Koha Administrator', 'YesNo'),
427	('OpacResetPassword','0','','Shows the ''Forgot your password?'' link in the OPAC','YesNo'),	428	('OpacResetPassword','0','','Shows the ''Forgot your password?'' link in the OPAC','YesNo'),
428	('OPACResultsLibrary', 'homebranch', 'homebranch\|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice'),	429	('OPACResultsLibrary', 'homebranch', 'homebranch\|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice'),
429	('OPACResultsSidebar','','70\|10','Define HTML to be included on the search results page, underneath the facets sidebar','Textarea'),	430	('OPACResultsSidebar','','70\|10','Define HTML to be included on the search results page, underneath the facets sidebar','Textarea'),

Lines 370-375 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-1 / +6 lines)
370	top: "top"	370	top: "top"
371	footer: "only footer"	371	footer: "only footer"
372	Features:	372	Features:
		373	-
		374	- pref: OPACReportProblem
		375	choices:
		376	yes: Allow
		377	no: "Don't allow"
		378	- patrons to submit problem reports for OPAC pages to the library or Koha Administrator.
373	-	379	-
374	- pref: opacuserlogin	380	- pref: opacuserlogin
375	choices:	381	choices:
376	-

Return to bug 4461

Lines 4436-4441 CREATE TABLE return_claims ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (+21 lines)
4436	CONSTRAINT `rc_resolved_by_ibfk` FOREIGN KEY (`resolved_by`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE	4436	CONSTRAINT `rc_resolved_by_ibfk` FOREIGN KEY (`resolved_by`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE
4437	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;	4437	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4438		4438
		4439	--
		4440	-- Table structure for table `problem_reports`
		4441	--
		4442
		4443	DROP TABLE IF EXISTS `problem_reports`;
		4444	CREATE TABLE `problem_reports` (
		4445	`reportid` int(11) NOT NULL auto_increment, -- unqiue identifier assigned by Koha
		4446	`title` varchar(40) NOT NULL default '', -- report subject line
		4447	`content` varchar(255) NOT NULL default '', -- report message content
		4448	`borrowernumber` int(11) default NULL, -- the user who created the problem report
		4449	`branchcode` varchar(10) NOT NULL default '', -- borrower's branch
		4450	`username` varchar(75) default NULL, -- OPAC username
		4451	`problempage` varchar(255) default NULL, -- page the user triggered the problem report form from
		4452	`recipient` enum('admin','library') NOT NULL default 'library', -- the 'to-address' of the problem report
		4453	`reportdate` datetime default NULL, -- date and time of report submission
		4454	`status` varchar(1) NOT NULL default 'N', -- status of the report. N=new, V=viewed, C=closed
		4455	PRIMARY KEY (`reportid`),
		4456	CONSTRAINT `problem_reports_ibfk1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
		4457	CONSTRAINT `problem_reports_ibfk2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
		4458	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
		4459
4439	/!40103 SET TIME_ZONE=@OLD_TIME_ZONE /;	4460	/!40103 SET TIME_ZONE=@OLD_TIME_ZONE /;
4440	/!40101 SET SQL_MODE=@OLD_SQL_MODE /;	4461	/!40101 SET SQL_MODE=@OLD_SQL_MODE /;
4441	/!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS /;	4462	/!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS /;