From e85875ca470447445da3b901562cb3804c777746 Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Wed, 27 Mar 2019 23:56:51 +0000 Subject: [PATCH] Bug 14576: (QA follow-up) Tidy up feature documentation To test: Apply this patch with all of the others run the updatedatabase, it should work install a new Koha, this pref should be installed and look fine in the interface. Check the syspref, make sure the text looks ok and makes sense. Bonus points: for checking to make sure PROC: _PERM_ appears in the new pereference if InProcessingToShelvingCart was set for checking to make sure _ALL_: CART appears in the new preferenec if ReturnToShelvingCart was previously set. --- .../bug_14576_add_UpdateItemLocationOnCheckin.perl | 2 +- installer/data/mysql/sysprefs.sql | 2 +- .../en/modules/admin/preferences/circulation.pref | 23 +++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_14576_add_UpdateItemLocationOnCheckin.perl b/installer/data/mysql/atomicupdate/bug_14576_add_UpdateItemLocationOnCheckin.perl index 06f6057471..c2050ccb8b 100644 --- a/installer/data/mysql/atomicupdate/bug_14576_add_UpdateItemLocationOnCheckin.perl +++ b/installer/data/mysql/atomicupdate/bug_14576_add_UpdateItemLocationOnCheckin.perl @@ -1,7 +1,7 @@ $DBversion = 'XXX'; # will be replaced by the RM if( CheckVersion( $DBversion ) ) { $dbh->do(q{ - INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('UpdateItemLocationOnCheckin', 'PROC: _PERM_\n', 'NULL', 'This a list of value pairs. When an item is checked in, if the location value on the left matches the items location value t will be updated to the right-hand value. E.g. ''PROC: FIC'' will cause an item that was set to ''Processing Center'' to now be in the ''Fiction'' shelving location. Note that PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout. You can also use the special term _BLANK_ on either side of a pair to update/remove items with no locaiton assigned. You can use the special term _ALL_ on the left side to affect all items and the special term _PERM_ on the right side to return items to their permanent location', 'Free'); + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('UpdateItemLocationOnCheckin', 'PROC: _PERM_\n', 'NULL', 'This a list of value pairs.\n Examples:\n PROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.\n FIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.\n _BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check in.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check in.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no locaiton assigned. The special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.', 'Free'); }); $dbh->do(q{ UPDATE systempreferences s1, (SELECT IF(value,'PROC: CART\n','') AS p2c FROM systempreferences WHERE variable='InProcessingToShelvingCart') s2 SET s1.value= CONCAT(s2.p2c, REPLACE(s1.value,'PROC: _PERM_\n','') ) WHERE s1.variable='UpdateItemLocationOnCheckin' AND s1.value NOT LIKE '%PROC: CART%'; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 2dffe0395a..9a0757a950 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -604,7 +604,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'), ('UpdateItemWhenLostFromHoldList','',NULL,'This is a list of values to update an item when it is marked as lost from the holds to pull screen','Free'), ('UniqueItemFields','barcode','','Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table','Free'), -('UpdateItemLocationOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, if the location value on the left matches the items location value it will be updated to the right-hand value. E.g. ''PROC: FIC'' will cause an item that was set to ''Book Cart'' to now be in the ''Fiction'' shelving location. Note that PROC and CART are special values, for these locations only can location and permanent_location differ. In all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout. You can also use the special term _BLANK_ on either side of a pair to update/remove items with no locaiton assigned. You can use the special term _ALL_ on the left side to affect all items and the special term _PERM_ on the right side to return items to their permanent location', 'Free'), +('UpdateItemLocationOnCheckin', '', 'NULL', 'This a list of value pairs.\n Examples:\n\nPROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.\nFIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.\n_BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check in.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check in.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\n\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\n\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no locaiton assigned.\nThe special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.', 'Free'), ('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. ''-1: 0'' will cause an item that was set to ''Ordered'' to now be available for loan. Each pair of values should be on a separate line.', 'Free'), ('UpdateTotalIssuesOnCirc','0',NULL,'Whether to update the totalissues field in the biblio on each circ.','YesNo'), ('UploadPurgeTemporaryFilesDays','',NULL,'If not empty, number of days used when automatically deleting temporary uploads','integer'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index df80f41720..0a89e3ef39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -521,17 +521,18 @@ Circulation: - pref: UpdateItemLocationOnCheckin type: textarea class: code - - This is is a list of value pairs, the first value is followed immediately by colon space then the second value i.e.:
- - "PROC: FIC" - -
When an item is checked in, if the location value on the left matches the items location value - - "it will be updated to the right-hand value.
E.g. ''PROC: FIC'' will cause an item that was set to ''Processing Center'' to now be in the ''Fiction'' shelving location." - -
Note that PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. - -
Items in the CART location will be returned to their permanent location on checkout. - -
You can use the special term _BLANK_ on either side of a pair to update/remove items with no location assigned. - -
You can use the special term _ALL_ on the left side to affect all items. - - and the special term _PERM_ on the right side to return items to their permanent location. - -
Use of an _ALL_ rule will override/ignore any other values. - -
Each pair of values should be on a separate line. + - "This a list of value pairs. the first value is followed immediately by colon space then the second value.

" + - "Examples:
" + - "PROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.
" + - "FIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.
" + - "_BLANK_: FIC - causes an item that has no location to be updated into the Fiction location on check in.
" + - "FIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.
" + - "_ALL_: FIC - causes all items to be updated into the Fiction location on check in.
" + - "PROC: _PERM_ - causes an item that is in the Processing Center to be updated to it's permanent location.

" + - "General rule: if the location value on the left of the colon (:) matches the item's current location, it will be updated to match the location value on the right of the colon (:).
" + - "Note: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.
" + - "The special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no locaiton assigned.
" + - "The special term _ALL_ is used on the left side of the colon (:) to affect all items, and overrides all other rules." - - pref: UpdateNotForLoanStatusOnCheckin type: textarea -- 2.11.0