Bugzilla – Attachment 124420 Details for
Bug 28883
Koha::Objects->_new_from_dbic doesn't work correctly in list context
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28883: (QA follow-up) Update use of Scalar
Bug-28883-QA-follow-up-Update-use-of-Scalar.patch (text/plain), 2.51 KB, created by
Martin Renvoize
on 2021-09-02 08:57:20 UTC
(
hide
)
Description:
Bug 28883: (QA follow-up) Update use of Scalar
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2021-09-02 08:57:20 UTC
Size:
2.51 KB
patch
obsolete
>From cf6518b6a9e78600a5fe360ad230271565b2205c Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 2 Sep 2021 09:55:59 +0100 >Subject: [PATCH] Bug 28883: (QA follow-up) Update use of Scalar > >This patch updates the use of the TT Scalar plugin and clarifies >resultset objects vs arrays in the variable naming. >--- > .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 4 ++-- > .../intranet-tmpl/prog/en/includes/catalog-strings.inc | 10 +++++----- > 2 files changed, 7 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >index e194411af5..2f21b44e92 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -169,8 +169,8 @@ > <div class="btn-group"><a id="printbiblio" class="btn btn-default"><i class="fa fa-print"></i> Print</a></div> > > [% IF ( CAN_user_reserveforothers ) %] >- [% SET items = biblio.items %] >- [% IF Context.Scalar(Context.Scalar(items, "filter_by_for_hold"), "count") %] >+ [% SET items_rs = Context.Scalar(biblio, 'items') %] >+ [% IF items_rs.count %] > [% IF ( holdfor ) %] > <div class="btn-group"> > <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc >index d74261d089..bbcf7a40d7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc >@@ -5,11 +5,11 @@ > var biblionumber = [% biblionumber | html %]; > var count = [% count | html %]; > var holdcount = [% holdcount | html %]; >- [% SET orders = biblio.orders %] >- [% SET current = Context.Scalar(orders, "filter_by_current") %] >- [% SET cancelled = Context.Scalar(orders, "filter_by_cancelled") %] >- var countorders = [% current.count || 0 | html %]; >- var countdeletedorders = [% cancelled.count || 0 | html %]; >+ [% SET orders_rs = Context.Scalar(biblio, 'orders') %] >+ [% SET current_rs = Context.Scalar(orders_rs, 'filter_by_current') %] >+ [% SET cancelled_rs = Context.Scalar(orders_rs, 'filter_by_cancelled') %] >+ var countorders = [% current_rs.count || 0 | html %]; >+ var countdeletedorders = [% cancelled_rs.count || 0 | html %]; > var searchid = '[% searchid | html %]'; > > /* provide Z3950 search points */ >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28883
:
123976
|
123977
|
123980
|
123981
|
123992
|
123993
|
123994
|
123995
|
124181
| 124420