From 6e2196ec0e74ee757aacea89d937b719f1875a1b Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Tue, 11 Sep 2018 14:58:29 -0400
Subject: [PATCH] LP#1721139: apply proper date format in certain places
This patch ensures that the correct date format is used
to display dates in certain contexts in the web staff
client:
- patron bucket summary
- record bucket summary
- patron bucket 'View batch edits'
This has the side effect of fixing a problem where the batch
edit timestamps were not wrapped correctly in Firefox.
To test
-------
1. Using user buckets, make some batch changes on some patrons and roll
back some of those changes.
2. Using Firefox, click on the 'View Batch Edits' button.
3. Note that the times dispayed are formatted as raw
database timestamps
4. Note that the summary for the user bucket displays the
create time as a raw database timestamp.
5. Navigate to a record bucket and note that its create
time is displayed as a raw timestamp as well.
3. Apply patch.
4. Repeat steps 2-5; this time, the times should be displayed
using the correct date and time format.
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
Open-ILS/src/templates/staff/cat/bucket/share/t_bucket_info.tt2 | 2 +-
Open-ILS/src/templates/staff/circ/patron/bucket/t_bucket_info.tt2 | 2 +-
Open-ILS/src/templates/staff/circ/patron/bucket/t_changesets.tt2 | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Open-ILS/src/templates/staff/cat/bucket/share/t_bucket_info.tt2 b/Open-ILS/src/templates/staff/cat/bucket/share/t_bucket_info.tt2
index 9862c3341b..333f8eed7b 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/share/t_bucket_info.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/share/t_bucket_info.tt2
@@ -6,7 +6,7 @@
when="{'one': '[% l("1 item") %]', 'other': '[% l("{} items") %]'}">
</ng-pluralize>
</span>
- <span> / [% l('Created {{bucket().create_time() | date}}') %]</span>
+ <span> / [% l('Created {{bucket().create_time() | date:egDateAndTimeFormat}}') %]</span>
<span ng-show="bucket()._owner_name"> /
{{bucket()._owner_name}}
<a target="_self" href="./circ/patron/{{bucket().owner()}}/checkout">
diff --git a/Open-ILS/src/templates/staff/circ/patron/bucket/t_bucket_info.tt2 b/Open-ILS/src/templates/staff/circ/patron/bucket/t_bucket_info.tt2
index 6245f95adb..ee05b480ab 100644
--- a/Open-ILS/src/templates/staff/circ/patron/bucket/t_bucket_info.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/bucket/t_bucket_info.tt2
@@ -6,7 +6,7 @@
when="{'one': '[% l("1 item") %]', 'other': '[% l("{} items") %]'}">
</ng-pluralize>
</span>
- <span> / [% l('Created {{bucket().create_time() | date}}') %]</span>
+ <span> / [% l('Created {{bucket().create_time() | date:egDateAndTimeFormat}}') %]</span>
<span ng-show="bucket().description()"> / {{bucket().description()}}</span>
</div>
diff --git a/Open-ILS/src/templates/staff/circ/patron/bucket/t_changesets.tt2 b/Open-ILS/src/templates/staff/circ/patron/bucket/t_changesets.tt2
index dc98390a26..dce5481f46 100644
--- a/Open-ILS/src/templates/staff/circ/patron/bucket/t_changesets.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/bucket/t_changesets.tt2
@@ -23,10 +23,10 @@
{{g.name()}}
</div>
<div class="col-md-3">
- {{g.complete_time() | date}}
+ {{g.complete_time() | date:egDateAndTimeFormat}}
</div>
<div class="col-md-3">
- {{g.rollback_time() | date}}
+ {{g.rollback_time() | date:egDateAndTimeFormat}}
</div>
<div class="col-md-2">
<button class="btn btn-primary"
--
2.11.0