From b391860e3c9e5d83364c3106cc3ca6ec354ba7c1 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 29 Oct 2014 17:08:55 -0400 Subject: [PATCH] KMAIN-599: Remove/hide feature from KMAIN-332 Cross-port: 3f7ba2b --- Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm | 8 +------- Open-ILS/web/js/ui/default/actor/user/register.js | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm index 33a830f0a7..d4faa2c113 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm @@ -195,13 +195,7 @@ sub user_settings { my($e, $user_id, $setting) = @_; my $val = $e->search_actor_user_setting({usr => $user_id, name => $setting})->[0]; return undef unless $val; # XXX this should really return undef, but needs testing - - # Allows this setting to load correctly in the staff client - if ($val->name eq 'history.circ.retention_start'){ - - return 't'; - } - + return OpenSRF::Utils::JSON->JSON2perl($val->value); } diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js index 139c4346b9..429cc79d0a 100644 --- a/Open-ILS/web/js/ui/default/actor/user/register.js +++ b/Open-ILS/web/js/ui/default/actor/user/register.js @@ -827,7 +827,7 @@ function uEditFetchUserSettings(userId) { /* fetch any user setting types we need + any that offer opt-in */ userSettingTypes = pcrud.search('cust', { '-or' : [ - {name:['circ.holds_behind_desk', 'opac.hold_notify', 'opac.default_pickup_location', 'opac.default_sms_carrier', 'opac.default_sms_notify', 'history.circ.retention_start']}, + {name:['circ.holds_behind_desk', 'opac.hold_notify', 'opac.default_pickup_location', 'opac.default_sms_carrier', 'opac.default_sms_notify']}, {name : { 'in': { select : {atevdef : ['opt_in_setting']}, -- 2.11.0