[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_6 updated. 5d60eb1f68c9ec5686f81603a1564a8547d5e205
Evergreen Git
git at git.evergreen-ils.org
Thu Sep 18 20:14:02 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_6 has been updated
via 5d60eb1f68c9ec5686f81603a1564a8547d5e205 (commit)
via 590ff38a94853f3737a2e758d1742b067f03b333 (commit)
via 21d20d0639c259f948726467a5110d56d7db1ec3 (commit)
from a5160f64b59cd1d9103454820c8aece6d2e703e1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5d60eb1f68c9ec5686f81603a1564a8547d5e205
Author: Jason Stephenson <jstephenson at mvlc.org>
Date: Mon May 19 09:19:49 2014 -0400
LP 1319560: Another fix for summary.tt2.
Argument "" isn't numeric in numeric gt (>) at
/openils/var/templates/opac/parts/record/summary.tt2 line 56.
It was apparently coming from the .size and not where I thought.
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 6bee46d..fc47b6a 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -42,7 +42,7 @@
<div id="rdetail_actions_div">
[%- search_ou = ctx.search_ou;
IF ctx.place_unfillable ||
- ( attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size > 0
+ ( attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size
&& (ctx.holds_block.enabled != 'true' || !attrs.org_copy_counts.$search_ou.available)
)
%]
commit 590ff38a94853f3737a2e758d1742b067f03b333
Author: Jason Stephenson <jstephenson at mvlc.org>
Date: Thu May 15 11:31:56 2014 -0400
LP 1319560: Fix the disappearing hold button.
Staff discovered an issue with the tt2 changes that caused the
place hold button to disappear when it shouldn't. Changing an &&
back to || seems to fix this.
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 27dcdd3..6bee46d 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -43,7 +43,7 @@
[%- search_ou = ctx.search_ou;
IF ctx.place_unfillable ||
( attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size > 0
- && (ctx.holds_block.enabled != 'true' && !attrs.org_copy_counts.$search_ou.available)
+ && (ctx.holds_block.enabled != 'true' || !attrs.org_copy_counts.$search_ou.available)
)
%]
<div class="rdetail_aux_utils place_hold">
commit 21d20d0639c259f948726467a5110d56d7db1ec3
Author: Jason Stephenson <jstephenson at mvlc.org>
Date: Wed May 14 15:46:29 2014 -0400
LP 1319560: Silence template error messages in Apache error log.
We get a number of messages like the following in our Apache error
logs on a constant basis:
Argument "" isn't numeric in addition (+) at
/openils/var/templates/opac/parts/record/navigation.tt2 line 6.
Argument "" isn't numeric in division (/) at
/openils/var/templates/opac/results.tt2 line 1.
Argument "" isn't numeric in numeric ge (>=) at
/openils/var/templates/opac/parts/record/navigation.tt2 line 38.
Argument "" isn't numeric in numeric gt (>) at
/openils/var/templates/opac/myopac/holds/edit.tt2 line 106.
Argument "" isn't numeric in numeric gt (>) at
/openils/var/templates/opac/myopac/holds.tt2 line 42.
Argument "" isn't numeric in numeric gt (>) at
/openils/var/templates/opac/parts/place_hold.tt2 line 98.
Argument "" isn't numeric in numeric gt (>) at
/openils/var/templates/opac/parts/record/summary.tt2 line 56.
Argument "" isn't numeric in numeric gt (>) at
/openils/var/templates/opac/parts/result/table.tt2 line 87.
Argument "" isn't numeric in numeric lt (<) at
/openils/var/templates/opac/myopac/hold_history.tt2 line 122.
Argument "" isn't numeric in numeric lt (<) at
/openils/var/templates/opac/myopa/result/table.tt2 line 87.
Argument "" isn't numeric in numeric lt (<) at
/openils/var/templates/opac/myopac/hold_history.tt2 line 122.
Argument "" isn't numeric in numeric lt (<) at
/openils/var/templates/opac/myopac/holds.tt2 line 215.
This commit adds some sanity checking to make those messages go
away.
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index a28b5b4..8412f42 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -47,7 +47,7 @@
<div class="clear-both"></div>
<div id='holds_main'>
- [% IF ctx.holds.size < 1 %]
+ [% IF ctx.holds.size && ctx.holds.size < 1 %]
<div class="warning_box">
<big><strong>[% l('No holds found.') %]</strong></big>
</div>
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index 08ebfce..6dbd4a2 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -3,9 +3,9 @@
PROCESS "opac/parts/hold_status.tt2";
WRAPPER "opac/parts/myopac/base.tt2";
myopac_page = "holds";
- limit = ctx.holds_limit;
- offset = ctx.holds_offset;
- count = ctx.holds_ids.size;
+ limit = (ctx.holds_limit.defined) ? ctx.holds_limit : 0;
+ offset = (ctx.holds_offset.defined) ? ctx.holds_offset : 0;
+ count = (ctx.holds_ids.size.defined) ? ctx.holds_ids.size : 0;
%]
<h3 class="sr-only">[% l('My Holds') %]</h3>
<div id='myopac_holds_div'>
@@ -96,7 +96,7 @@
</td>
</tr>
</table>
- [% IF ctx.holds.size < 1 %]
+ [% IF ctx.holds.size && ctx.holds.size < 1 %]
<div class="warning_box">[% l('No holds found.') %]</div>
[% ELSE %]
<table id="acct_holds_main_header" title="[% l('Items on Hold') %]"
diff --git a/Open-ILS/src/templates/opac/myopac/holds/edit.tt2 b/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
index e086e8f..6b567a6 100644
--- a/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
@@ -104,7 +104,7 @@
<tr><td colspan='4'>
[% IF hold.metarecord_filters.formats.size OR
- hold.metarecord_filters.langs.size > 1;
+ (hold.metarecord_filters.langs.size.defined && hold.metarecord_filters.langs.size > 1);
PROCESS metarecord_hold_filters_selector
hold_data=hold; END %]
</td></tr>
diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index 1a497f7..8c70ca5 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -96,7 +96,7 @@
[% l('Advanced Hold Options') %]</a>
[% END %]
[% IF hdata.metarecord_filters.formats.size OR # should this be size > 1
- hdata.metarecord_filters.langs.size > 1;
+ (hdata.metarecord_filters.langs.size && hdata.metarecord_filters.langs.size > 1);
PROCESS metarecord_hold_filters_selector hold_data=hdata;
END;
END %]
diff --git a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
index 29b1106..8b38a7f 100644
--- a/Open-ILS/src/templates/opac/parts/record/navigation.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
@@ -1,4 +1,4 @@
-[% IF ctx.search_result_index >= 0 %]
+[% IF ctx.search_result_index.defined && ctx.search_result_index >= 0 %]
<div class="rdetail_header">
<span class="rdetail_results">
<a href='[% mkurl(ctx.opac_root _ '/results', {}, stop_parms); %]'>[% l('◄ Search Results') %]</a>
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index fffd158..27dcdd3 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -43,7 +43,7 @@
[%- search_ou = ctx.search_ou;
IF ctx.place_unfillable ||
( attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size > 0
- && (ctx.holds_block.enabled != 'true' || attrs.org_copy_counts.$search_ou.available == 0)
+ && (ctx.holds_block.enabled != 'true' && !attrs.org_copy_counts.$search_ou.available)
)
%]
<div class="rdetail_aux_utils place_hold">
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 966ef6c..a0772f2 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -87,7 +87,7 @@
[% html_text_attr('title', l('Display record details for "[_1]"', attrs.title)) %]>
[% attrs.title | html %]
</a>
- [% IF rec.mr_constituent_count > 1 %]
+ [% IF rec.mr_constituent_count.defined && rec.mr_constituent_count > 1 %]
<span title="[% l('This group contains [_1] records', rec.mr_constituent_count) %]">
([% rec.mr_constituent_count %])
</span>
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index 1bd4d32..a3cb0e1 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -11,7 +11,7 @@
page = CGI.param('page');
page = page.match('^\d+$') ? page : 0; # verify page is a sane value
- page_count = ctx.page_size == 0 ? 1 : POSIX.ceil(ctx.hit_count / ctx.page_size);
+ page_count = (!ctx.page_size.defined || !ctx.hit_count.defined || ctx.page_size == 0) ? 1 : POSIX.ceil(ctx.hit_count / ctx.page_size);
PROCESS "opac/parts/misc_util.tt2";
PROCESS get_library;
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/opac/myopac/hold_history.tt2 | 2 +-
Open-ILS/src/templates/opac/myopac/holds.tt2 | 8 ++++----
Open-ILS/src/templates/opac/myopac/holds/edit.tt2 | 2 +-
Open-ILS/src/templates/opac/parts/place_hold.tt2 | 2 +-
.../src/templates/opac/parts/record/navigation.tt2 | 2 +-
.../src/templates/opac/parts/record/summary.tt2 | 4 ++--
Open-ILS/src/templates/opac/parts/result/table.tt2 | 2 +-
Open-ILS/src/templates/opac/results.tt2 | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list