View | Details | Raw Unified | Return to bug 28773
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-3 / +3 lines)
Lines 184-192 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
184
                <div class="btn-group dropup">
184
                <div class="btn-group dropup">
185
                    <a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button data-toggle="dropdown" class="btn-xs dropdown-toggle"><span class="caret"></span></button>
185
                    <a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button data-toggle="dropdown" class="btn-xs dropdown-toggle"><span class="caret"></span></button>
186
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid | html %]">
186
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid | html %]">
187
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC</a></li>
187
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC</a></li>
188
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card</a></li>
188
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData" data-action="show_card"><i class="fa fa-eye"></i> Card</a></li>
189
                        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="chosen" title="Order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a></li>
189
                        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="chosen" title="Order" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a></li>
190
                    </ul>
190
                    </ul>
191
                </div>
191
                </div>
192
            </td>
192
            </td>
(-)a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js (-10 / +11 lines)
Lines 126-134 $( document ).ready( function() { Link Here
126
126
127
    $( "#resultst" ).on("click", ".chosen", function(e) {
127
    $( "#resultst" ).on("click", ".chosen", function(e) {
128
        e.preventDefault();
128
        e.preventDefault();
129
        var title = $(this).attr('title');
129
        var action = $(this).data('action');
130
        ChangeLastAction( title, 0 );
130
        ChangeLastAction( action, 0 );
131
        if( title == 'Order' ) window.location = $(this).attr('href');
131
        if( action == 'order' ) window.location = $(this).attr('href');
132
        else {
132
        else {
133
            opener.document.location = $(this).attr('href');
133
            opener.document.location = $(this).attr('href');
134
            window.close();
134
            window.close();
Lines 140-154 function InitLastAction() { Link Here
140
    if( $("#resultst").length == 0 ) return;
140
    if( $("#resultst").length == 0 ) return;
141
    try { last_action = localStorage.getItem('z3950search_last_action'); } catch (err) {}
141
    try { last_action = localStorage.getItem('z3950search_last_action'); } catch (err) {}
142
    if( last_action ) {
142
    if( last_action ) {
143
        var linkcount = $(".z3950actions:eq(0)").siblings(".dropdown-menu").find("a[title='"+last_action+"']").length;
143
        var z3950_action_li = $(".z3950actions:eq(0)").siblings(".dropdown-menu").find("a[data-action='"+last_action+"']");
144
        if( linkcount == 0 ) return;
144
        if( z3950_action_li.length == 0 ) return;
145
        if( last_action != 'MARC' ) $( ".z3950actions" ).text( last_action );
145
        if( last_action != 'show_marc' ) {
146
            $( ".z3950actions" ).text($(z3950_action_li).text()).data('action', last_action);
147
        }
146
    }
148
    }
147
}
149
}
148
150
149
function ChangeLastAction(title, change_text) {
151
function ChangeLastAction(action, change_text) {
150
    if( last_action && last_action == title ) return;
152
    if( last_action && last_action == action ) return;
151
    last_action = title;
153
    last_action = action;
152
    if( change_text ) $( ".z3950actions" ).text( last_action );
154
    if( change_text ) $( ".z3950actions" ).text( last_action );
153
    if( previewed == 0 || change_text == 1 )
155
    if( previewed == 0 || change_text == 1 )
154
        try { localStorage.setItem('z3950search_last_action', last_action); } catch(err) {}
156
        try { localStorage.setItem('z3950search_last_action', last_action); } catch(err) {}
155
- 

Return to bug 28773