Attachment 41795 Details for Bug 11625 – [SIGNED-OFF] Bug 11625 - Add system preferences DefaultToLoggedInLibraryCircRules and DefaultToLoggedInLibraryNoticesSlips

[patch] [SIGNED-OFF] Bug 11625 - Add system preferences DefaultToLoggedInLibraryCircRules and DefaultToLoggedInLibraryNoticesSlips

SIGNED-OFF-Bug-11625---Add-system-preferences-Defa.patch (text/plain), 4.48 KB, created by Kyle M Hall (khall) on 2015-08-21 19:01:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-08-21 19:01:05 UTC

Size: 4.48 KB

patch

obsolete

>From 30683d8d18b06797d266ebc5b316042c7d4f8f49 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Tue, 21 Apr 2015 10:59:46 -0400
>Subject: [PATCH] [SIGNED-OFF] Bug 11625 - Add system preferences DefaultToLoggedInLibraryCircRules and DefaultToLoggedInLibraryNoticesSlips
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> installer/data/mysql/sysprefs.sql                  |    2 ++
> installer/data/mysql/updatedatabase.pl             |   15 +++++++++++++++
> .../prog/en/modules/admin/preferences/admin.pref   |   14 ++++++++++++++
> 3 files changed, 31 insertions(+), 0 deletions(-)
>
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index ac79f44..b908813 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -106,6 +106,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('DefaultLongOverdueLostValue', NULL, NULL, "Set the LOST value of an item to n when the item has been overdue for more than defaultlongoverduedays days.", 'integer'),
> ('defaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
> ('defaultSortOrder','dsc','asc|dsc|az|za','Specify the default sort order','Choice'),
>+('DefaultToLoggedInLibraryCircRules',  '0', NULL ,  'If enabled, circ rules editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'),
>+('DefaultToLoggedInLibraryNoticesSlips',  '0', NULL ,  'If enabled,slips and notices editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'),
> ('delimiter',';',';|tabulation|,|/|\\|#||','Define the default separator character for exporting reports','Choice'),
> ('Display856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','Choice'),
> ('DisplayClearScreenButton','0','','If set to ON, a clear screen button will appear on the circulation page.','YesNo'),
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 10809a1..c99263b 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -10761,6 +10761,21 @@ if ( CheckVersion($DBversion) ) {
>     SetVersion ($DBversion);
> }
> 
>+$DBversion = "3.21.00.XXX";
>+if(CheckVersion($DBversion)) {
>+    $dbh->do(q{
>+        INSERT INTO systempreferences ( variable, value, options, explanation, type )
>+        VALUES (
>+            'DefaultToLoggedInLibraryCircRules',  '0', NULL ,  'If enabled, circ rules editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'
>+        ), (
>+            'DefaultToLoggedInLibraryNoticesSlips',  '0', NULL ,  'If enabled,slips and notices editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'
>+        )
>+    });
>+
>+    print "Upgrade to $DBversion done (Bug 13379 - Modify authorised_values.category to varchar(32))\n";
>+    SetVersion($DBversion);
>+}
>+
> # DEVELOPER PROCESS, search for anything to execute in the db_update directory
> # SEE bug 13068
> # if there is anything in the atomicupdate, read and execute it.
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
>index 4ec683f..0df251b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
>@@ -50,6 +50,20 @@ Administration:
>                   yes: Allow
>                   no: "Don't allow"
>             - staff and patrons to create and view saved lists of books.
>+        -
>+            - When editing circulation rules show the
>+            - pref: DefaultToLoggedInLibraryCircRules
>+              choices:
>+                  yes: "logged in library's"
>+                  no: "all libraries"
>+            - rules by default.
>+        -
>+            - When editing notices and slips show the 
>+            - pref: DefaultToLoggedInLibraryNoticesSlips
>+              choices:
>+                  yes: "logged in library's"
>+                  no: "all libraries"
>+            - notices and slips by default.
>     Login options:
>         -
>             - Automatically log out users after
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 11625: 24845 | 24861 | 24941 | 24984 | 24985 | 25839 | 25840 | 35460 | 35461 | 35462 | 35463 | 37055 | 37056 | 37057 | 37058 | 38093 | 38094 | 38095 | 38096 | 38276 | 38277 | 38278 | 38422 | 38424 | 41795 | 41796 | 41797 | 43496 | 43497 | 43498