From 9014d7987620a7a7457d3a2066a6d1014e66452f Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Thu, 16 Mar 2017 15:34:51 -0400 Subject: [PATCH] Revert "LP#1661346 - trim quotes from setting value" This reverts commit d1b90073b092247705f12584adda689535fab71c. --- Open-ILS/src/sql/Pg/reporter-schema.sql | 8 ++++---- Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/sql/Pg/reporter-schema.sql b/Open-ILS/src/sql/Pg/reporter-schema.sql index 112eae4753..bce58ba482 100644 --- a/Open-ILS/src/sql/Pg/reporter-schema.sql +++ b/Open-ILS/src/sql/Pg/reporter-schema.sql @@ -380,7 +380,7 @@ CREATE OR REPLACE VIEW reporter.currently_running AS WHERE s.start_time IS NOT NULL AND s.complete_time IS NULL; CREATE OR REPLACE VIEW reporter.user_setting_type_view AS -SELECT usr.id as usr_id, + SELECT usr.id as usr_id, (SELECT value FROM actor.usr_setting WHERE name = 'opac.default_phone' @@ -388,7 +388,7 @@ SELECT usr.id as usr_id, (SELECT name FROM config.sms_carrier WHERE id::text IN ( - SELECT trim(both '"''' from value) + SELECT value FROM actor.usr_setting WHERE name = 'opac.default_sms_carrier' AND usr = usr.id)) AS default_sms_carrier, @@ -399,11 +399,11 @@ SELECT usr.id as usr_id, (SELECT shortname FROM actor.org_unit WHERE id::text IN ( - SELECT trim(both '"''' from value) + SELECT value FROM actor.usr_setting WHERE name = 'opac.default_pickup_location' AND usr = usr.id)) AS default_pickup_location -FROM actor.usr usr; + FROM actor.usr usr; COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql index 257aebd794..c84662b054 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql @@ -9,7 +9,7 @@ SELECT usr.id as usr_id, (SELECT name FROM config.sms_carrier WHERE id::text IN ( - SELECT trim(both '"''' from value) + SELECT value FROM actor.usr_setting WHERE name = 'opac.default_sms_carrier' AND usr = usr.id)) AS default_sms_carrier, @@ -20,7 +20,7 @@ SELECT usr.id as usr_id, (SELECT shortname FROM actor.org_unit WHERE id::text IN ( - SELECT trim(both '"''' from value) + SELECT value FROM actor.usr_setting WHERE name = 'opac.default_pickup_location' AND usr = usr.id)) AS default_pickup_location -- 2.11.0