Bug 7226 - can't add tags on list

Incorrect check for TagsInputOnList was preventing the
right JavaScript from being triggered, and markup was
nested inside the wrong logic for the confirmation
message to be displayed consistently.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This commit is contained in:
Owen Leonard 2011-12-06 09:53:05 -05:00 committed by Paul Poulain
parent 2ab11c4892
commit 0b9d4902de

View file

@ -92,7 +92,6 @@ $(function() {
$("#addtags").html("<a id=\"tagsel_tag\" href=\"#\">"+_("Tag")+"<\/a> |"); $("#addtags").html("<a id=\"tagsel_tag\" href=\"#\">"+_("Tag")+"<\/a> |");
$(".tagbutton").click(KOHA.Tags.add_tag_button); $(".tagbutton").click(KOHA.Tags.add_tag_button);
[% IF ( TagsInputOnList ) %]
[% IF ( loggedinusername ) %] [% IF ( loggedinusername ) %]
$("#tagsel_tag").click(function(){ $("#tagsel_tag").click(function(){
tagSelected(); tagSelected();
@ -112,7 +111,6 @@ $(function() {
return false; return false;
}); });
[% END %] [% END %]
[% END %]
[% END %][% END %][% END %] [% END %][% END %][% END %]
[% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %] [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
}); });
@ -278,14 +276,16 @@ $(function() {
[% END %][% ELSE %]This record has no items.[% END %]</span> [% END %][% ELSE %]This record has no items.[% END %]</span>
[% END %] [% END %]
[% IF ( TagsEnabled ) %] [% IF ( TagsEnabled ) %]
[% IF ( TagsShowOnList ) %] [% IF ( TagsShowOnList ) %]
[% IF ( itemsloo.TagLoop ) %] [% IF ( itemsloo.TagLoop.size ) %]
<div class="results_summary"> <div class="results_summary">
<span class="label">Tags:</span> <span class="label">Tags:</span>
<ul style="display: inline; list-style: none;">[% FOREACH TagLoo IN itemsloo.TagLoop %]<li style="display: inline; list-style: none;"><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&amp;q=[% TagLoo.term |url %]">[% TagLoo.term %]</a> <span class="weight">([% TagLoo.weight_total %])</span></li> <ul style="display: inline; list-style: none;">[% FOREACH TagLoo IN itemsloo.TagLoop %]<li style="display: inline; list-style: none;"><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&amp;q=[% TagLoo.term |url %]">[% TagLoo.term %]</a> <span class="weight">([% TagLoo.weight_total %])</span></li>
[% END %] [% END %]
</ul> </ul>
[% END %] </div>
[% END %]
[% END %]
[% IF ( TagsInputOnList ) %] [% IF ( TagsInputOnList ) %]
[% IF ( loggedinusername ) %] [% IF ( loggedinusername ) %]
<form name="tagform[% itemsloo.biblionumber %]" method="post" action="/cgi-bin/koha/opac-tags.pl"> <form name="tagform[% itemsloo.biblionumber %]" method="post" action="/cgi-bin/koha/opac-tags.pl">
@ -299,10 +299,10 @@ $(function() {
[% ELSIF ( loop.first ) %]<span class="tagstatus" id="login4tags">Log in to add tags.</span> [% ELSIF ( loop.first ) %]<span class="tagstatus" id="login4tags">Log in to add tags.</span>
[% END %] [% END %]
[% END %] [% END %]
[% IF ( itemsloo.TagLoop ) %] [% IF ( loggedinusername ) %]
</div>[% END %] <span id="newtag[% itemsloo.biblionumber %]_status" class="tagstatus" style="display:none;">Tag status here.</span>
[% END %]
[% END %] [% END %]
[% END %]
<span class="results_summary actions"><span class="label">Actions:</span> <span class="results_summary actions"><span class="label">Actions:</span>
[% IF ( RequestOnOpac ) %] [% IF ( RequestOnOpac ) %]