Bug 5795 [SIGNED-OFF] - Missing ReservesControlBranch system pref in database installer

sysprefs.sql file was missing ReservesControlBranch.

To test:
1) Create a new installation and check sysprefs.sql loads correctly.
2) Check ReservesControlBranch shows up correctly in the sys pref editor.
3) Check sys pref can be edited and new value saves correctly.

Signed-off-by: Marc Veron <veron@veron.ch>
- Line is added at the end of installer/data/mysql/sysprefs.sql
- Tested Line diretly in MySQL with a systempreferences table where variable 'ReservesControlBranch' was missing. Data inserted correctly.
- Syspref shows up in Staff client

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
- Fixed merge conflict

diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index cc3a9e2..2ffe2df 100644 (file)
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -364,3 +364,4 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES (
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacStarRatings','all',NULL,'disable|all|details','Choice');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacBrowseResults','1','Disable/enable browsing and paging search results from the OPAC detail page.',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SvcMaxReportRows','10','Maximum number of rows to return via the report web service.',NULL,'Integer');
+INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice');