Bugzilla – Attachment 104487 Details for
Bug 24279
Claims Returned does not work when set from moredetail.pl or additem.pl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24279: Display the tip in the title of the option
Bug-24279-Display-the-tip-in-the-title-of-the-opti.patch (text/plain), 5.92 KB, created by
Jonathan Druart
on 2020-05-07 10:34:05 UTC
(
hide
)
Description:
Bug 24279: Display the tip in the title of the option
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-05-07 10:34:05 UTC
Size:
5.92 KB
patch
obsolete
>From 47af79abfa15a863c7aa6af42b425761bb49fa97 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 7 May 2020 12:33:17 +0200 >Subject: [PATCH] Bug 24279: Display the tip in the title of the option > >This patch tells select2 to retrieve the title attribute from the >original option node. >--- > koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc | 3 +++ > .../prog/en/modules/catalogue/moredetail.tt | 12 +----------- > .../prog/en/modules/cataloguing/additem.tt | 10 +--------- > 3 files changed, 5 insertions(+), 20 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc >index c776cbafc8..9f0a4aeb02 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc >@@ -42,6 +42,9 @@ > var n = input.length - max; > return _("Please delete %d character(s)").format(n); > }, >+ formatResult: function(item) { >+ return $('<div>', {title: item.element[0].title}).text(item.text); >+ }, > formatSelectionTooBig: function (limit) { > return _("You can only select %s item(s)").format(limit); > }, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 62d08605db..9145c17a89 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -108,8 +108,7 @@ > <option value="">Choose</option> > [% FOREACH itemlostloo IN itemlostloop %] > [% IF ClaimReturnedLostValue && !ITEM_DAT.itemlost && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %] >- [% SET add_claims_returned_tip = itemlostloo.lib %] >- <option value="[% itemlostloo.authorised_value | html %]" disabled="disabled">[% itemlostloo.lib | html %]</option> >+ <option value="[% itemlostloo.authorised_value | html %]" disabled="disabled" title="At least one item is available at this library">[% itemlostloo.lib | html %]</option> > [% ELSIF itemlostloo.authorised_value == ITEM_DAT.itemlost %] > <option value="[% itemlostloo.authorised_value | html %]" selected="selected">[% itemlostloo.lib | html %]</option> > [% ELSE %] >@@ -120,12 +119,6 @@ > <input type="hidden" name="withdrawn" value="[% ITEM_DAT.withdrawn | html %]" /> > <input type="hidden" name="damaged" value="[% ITEM_DAT.damaged | html %]" /> > >- [% IF add_claims_returned_tip %] >- <i class="fa fa-question-circle" data-toggle="tooltip" >- title="The value '[% add_claims_returned_tip | html %]' cannot be selected. Return claims must be processed from the patron details page." >- data-placement="right"></i> >- [% END %] >- > [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] > <input type="submit" name="submit" class="submit" value="Set status" disabled="disabled"/> > <p class="help-block">Item has been claimed as returned.</p> >@@ -312,9 +305,6 @@ > <script> > var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10)); > browser.show(); >- $( document ).ready(function() { >- $('[data-toggle="tooltip"]').tooltip(); >- }); > </script> > [% END %] > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index 50ab2e22d4..3905435709 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -156,21 +156,13 @@ > <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option> > [% ELSE %] > [% IF ite.IS_LOST_AV && aval == Koha.Preference("ClaimReturnedLostValue") %] >- [% SET add_claims_returned_tip = mv.labels.$aval %] >- <option disabled="disabled" value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option> >+ <option disabled="disabled" value="[%- aval | html -%]" title="Return claims must be processed from the patron details page">[%- mv.labels.$aval | html -%]</option> > [% ELSE %] > <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option> > [% END %] > [% END %] > [% END %] > </select> >- >- [% IF ite.IS_LOST_AV && add_claims_returned_tip %] >- >- <i class="fa fa-question-circle" data-toggle="tooltip" >- title="The value '[% add_claims_returned_tip | html %]' cannot be selected. Return claims must be processed from the patron details page." >- data-placement="right"></i> >- [% END %] > [% ELSIF ( mv.type == 'text_auth' ) %] > [% IF mv.readonly %] > <input type="text" id="[%- mv.id | html -%]" name="field_value" class="input_marceditor" size="50" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" readonly="readonly" /> >-- >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 24279
:
96683
|
96684
|
96724
|
96725
|
103597
|
103598
|
104487
|
105355
|
107286
|
107287
|
107288
|
107289
|
107290
|
107311
|
107376
|
107377
|
107378
|
107379
|
107380
|
107381