Bug 22774: (QA follow-up) Add syspref descriptions to database update and sysprefs.sql

Moves the updatedatabase entry to the new format and
adds information for the explanation column of the
systempreferences table.

Also slightly rephrases the description in the system preference
editor.

To test:
- Verify database update still works the same with addition
  of explanations
- Verify the sys pref description makes sense

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/installer/data/mysql/atomicupdate/bug_22774.perl b/installer/data/mysql/atomicupdate/bug_22774.perl
index 42f5340..3cbbb4c 100644 (file)
--- a/installer/data/mysql/atomicupdate/bug_22774.perl
+++ b/installer/data/mysql/atomicupdate/bug_22774.perl
@@ -1,18 +1,11 @@
 $DBversion = '19.12.00.XXX'; # will be replaced by the RM
 if( CheckVersion( $DBversion ) ) {
-    # you can use $dbh here like:
-    # $dbh->do( "ALTER TABLE biblio ADD COLUMN badtaste int" );
+
     $dbh->do( q{
             INSERT IGNORE INTO systempreferences (variable,value,explanation,type) VALUES
-                ('MaxTotalSuggestions','','Number of total suggestions','Free'),
-                ('NumberOfSuggestionDays','','days','Free')
+                ('MaxTotalSuggestions','','Number of total suggestions used for time limit with NumberOfSuggestionDays','Free'),
+                ('NumberOfSuggestionDays','','Number of days that will be used to determine the MaxTotalSuggestions limit','Free')
             });
-    # or perform some test and warn
-    # if( !column_exists( 'biblio', 'biblionumber' ) ) {
-    #    warn "There is something wrong";
-    # }
 
-    # Always end with this (adjust the bug info)
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 22774 - Limit Purchase Suggestion in a specified Time period)\n";
+    NewVersion( $DBversion, 22774, "Limit purchase suggestion in a specified time period");
 }

diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 52ff06a..d4e5211 100644 (file)
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -323,8 +323,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('maxRecordsForFacets','20',NULL,NULL,'Integer'),
 ('maxreserves','50','','Define maximum number of holds a patron can place','Integer'),
 ('MaxSearchResultsItemsPerRecordStatusCheck','20','','Max number of items per record for which to check transit and hold status','Integer'),
-('MaxTotalSuggestions','',NULL,'Number of total suggestions','Free'),
-('NumberOfSuggestionDays','',NULL,'days','Free'),
+('MaxTotalSuggestions','',NULL,'Number of total suggestions used for time limit with NumberOfSuggestionDays','Free'),
 ('MembershipExpiryDaysNotice','',NULL,'Send an account expiration notice that a patron\'s card is about to expire after','Integer'),
 ('MergeReportFields','',NULL,'Displayed fields for deleted MARC records after merge','Free'),
 ('minPasswordLength','3',NULL,'Specify the minimum length of a patron/staff password','free'),
@@ -346,6 +345,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('NovelistSelectStaffProfile','',NULL,'Novelist Select user Profile for staff client','free'),
 ('NovelistSelectStaffView','tab','tab|above|below','Where to display Novelist Select content in the staff client','Choice'),
 ('NovelistSelectView','tab','tab|above|below|right','Where to display Novelist Select content','Choice'),
+('NumberOfSuggestionDays','',NULL,'Number of days that will be used to determine the MaxTotalSuggestions limit','Free'),
 ('numReturnedItemsToShow','20',NULL,'Number of returned items to show on the check-in page','Integer'),
 ('NumSavedReports', '20', NULL, 'By default, show this number of saved reports.', 'Integer'),
 ('numSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'),

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index e8b6ed1..586695e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -711,10 +711,10 @@ OPAC:
               class: integer
             - "open suggestions. Leave empty for no limit. **Note: this setting does not affect anonymous suggestions"
         -
-            - Number of total suggestions
+            - Number of total suggestions allowed
             - pref: MaxTotalSuggestions
               class: integer
-            - "for"
+            - "in"
             - pref: NumberOfSuggestionDays
               class: integer
             - "days."