From ac23a3355ff39dde2acf0c1c3f0be6e34053983d Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Thu, 8 Sep 2011 01:54:11 -0400 Subject: [PATCH] change column name from last_update_date to last_update_time Signed-off-by: Jason Etheridge Signed-off-by: Thomas Berezansky --- Open-ILS/examples/fm_IDL.xml | 2 +- Open-ILS/src/sql/Pg/005.schema.actors.sql | 4 ++-- .../src/sql/Pg/upgrade/XXXX.schema.au_last_update_date.sql | 10 +++++----- .../xul/staff_client/server/locale/en-US/common.properties | 2 +- .../xul/staff_client/server/locale/en-US/patron.properties | 2 +- Open-ILS/xul/staff_client/server/patron/display.js | 4 ++-- Open-ILS/xul/staff_client/server/patron/util.js | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index 15e15845e6..7900e7d19f 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -2593,7 +2593,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql index f9e8c3d1f1..7068bafd53 100644 --- a/Open-ILS/src/sql/Pg/005.schema.actors.sql +++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql @@ -64,7 +64,7 @@ CREATE TABLE actor.usr ( create_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), expire_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT (now() + '3 years'::INTERVAL), claims_never_checked_out_count INT NOT NULL DEFAULT 0, - last_update_date TIMESTAMP WITH TIME ZONE + last_update_time TIMESTAMP WITH TIME ZONE ); COMMENT ON TABLE actor.usr IS $$ User objects @@ -120,7 +120,7 @@ $$ LANGUAGE PLPGSQL; CREATE OR REPLACE FUNCTION actor.au_updated() RETURNS TRIGGER AS $$ BEGIN - NEW.last_update_date := now(); + NEW.last_update_time := now(); RETURN NEW; END; $$ LANGUAGE plpgsql; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.au_last_update_date.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.au_last_update_date.sql index 3b792913ee..f53b347488 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.au_last_update_date.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.au_last_update_date.sql @@ -1,22 +1,22 @@ --- Evergreen DB patch XXXX.schema.au_last_update_date.sql +-- Evergreen DB patch XXXX.schema.au_last_update_time.sql BEGIN; -- check whether patch can be applied SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); --- Add new column last_update_date to actor.usr, with trigger to maintain it +-- Add new column last_update_time to actor.usr, with trigger to maintain it -- Add corresponding new column to auditor.actor_usr_history ALTER TABLE actor.usr - ADD COLUMN last_update_date TIMESTAMPTZ; + ADD COLUMN last_update_time TIMESTAMPTZ; ALTER TABLE auditor.actor_usr_history - ADD COLUMN last_update_date TIMESTAMPTZ; + ADD COLUMN last_update_time TIMESTAMPTZ; CREATE OR REPLACE FUNCTION actor.au_updated() RETURNS TRIGGER AS $$ BEGIN - NEW.last_update_date := now(); + NEW.last_update_time := now(); RETURN NEW; END; $$ LANGUAGE plpgsql; diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties index fd84c89dbb..3968a6f80d 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties @@ -140,7 +140,7 @@ staff.au_alert_message_label=Alert staff.au_claims_returned_count_label=Returns Claimed staff.au_create_date_label=Created On staff.au_expire_date_label=Expires On -staff.au_last_update_date_label=Updated On +staff.au_last_update_time_label=Updated On staff.au_home_library_label=Home Library staff.au_home_library_fullname_label=Home Library (Full Name) staff.au_credit_forward_balance_label=Credit diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties index e21fee1566..003af0385f 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties @@ -110,7 +110,7 @@ staff.patron.display.init.network_request.error_showing_alert=Error showing patr staff.patron.display.render_search_form.patron_search=Patron Search staff.patron.display.tab_name=Patron: staff.patron.display.no_alerts_or_messages=No Alerts, Blocks, or Messages -# Field 1 = actor.usr.id, Field 2 = actor.usr.create_date, Field 3 = actor.usr.last_update_date +# Field 1 = actor.usr.id, Field 2 = actor.usr.create_date, Field 3 = actor.usr.last_update_time staff.patron.display.db_data=Database ID: %1$s Create Date: %2$s Last Updated: %3$s staff.patron.hold_notices.tooltiptext=ID: %1$s Hold ID: %2$s Notifying Staff ID: %3$s staff.patron.hold_notices.new_notification_record=New Notification Record diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js index bc84ae662e..29ad28d947 100644 --- a/Open-ILS/xul/staff_client/server/patron/display.js +++ b/Open-ILS/xul/staff_client/server/patron/display.js @@ -515,8 +515,8 @@ patron.display.prototype = { [ obj.patron.id(), obj.patron.create_date(), - obj.patron.last_update_date() - ? obj.patron.last_update_date() + obj.patron.last_update_time() + ? obj.patron.last_update_time() : '' ] ); diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js index 82a6e28373..78c270745d 100644 --- a/Open-ILS/xul/staff_client/server/patron/util.js +++ b/Open-ILS/xul/staff_client/server/patron/util.js @@ -446,10 +446,10 @@ patron.util.columns = function(modify,params) { ,'sort_value' : function(my) { return util.date.db_date2Date( my.au.create_date() ).getTime(); } }, { - 'persist' : 'hidden width ordinal', 'id' : 'au_last_update_date', 'label' : commonStrings.getString('staff.au_last_update_date_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'au_last_update_time', 'label' : commonStrings.getString('staff.au_last_update_time_label'), 'flex' : 1, 'sort_type' : 'date', - 'primary' : false, 'hidden' : true, 'editable' : false, 'render' : function(my) { return util.date.formatted_date( my.au.last_update_date(), "%{localized}" ); } - ,'sort_value' : function(my) { return util.date.db_date2Date( my.au.last_update_date() ).getTime(); } + 'primary' : false, 'hidden' : true, 'editable' : false, 'render' : function(my) { return util.date.formatted_date( my.au.last_update_time(), "%{localized}" ); } + ,'sort_value' : function(my) { return util.date.db_date2Date( my.au.last_update_time() ).getTime(); } }, { -- 2.11.0