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

(-)a/cataloguing/z3950_auth_search.pl (+4 lines)
Lines 42-47 my $subjectsubdiv = $input->param('subjectsubdiv'); Link Here
42
my $srchany       = $input->param('srchany');
42
my $srchany       = $input->param('srchany');
43
my $op            = $input->param('op')||'';
43
my $op            = $input->param('op')||'';
44
my $page            = $input->param('current_page') || 1;
44
my $page            = $input->param('current_page') || 1;
45
my $index         =$input->param('index');
46
45
$page = $input->param('goto_page') if $input->param('changepage_goto');
47
$page = $input->param('goto_page') if $input->param('changepage_goto');
46
48
47
my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
49
my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
Lines 63-68 $template->param( Link Here
63
    subjectsubdiv   => $subjectsubdiv,
65
    subjectsubdiv   => $subjectsubdiv,
64
    srchany      => $srchany,
66
    srchany      => $srchany,
65
    authid => $authid,
67
    authid => $authid,
68
    index => $index,
66
);
69
);
67
70
68
if ( $op ne "do_search" ) {
71
if ( $op ne "do_search" ) {
Lines 72-77 if ( $op ne "do_search" ) { Link Here
72
    $template->param(
75
    $template->param(
73
        serverloop   => $serverloop,
76
        serverloop   => $serverloop,
74
        opsearch     => "search",
77
        opsearch     => "search",
78
        index        => $index,
75
    );
79
    );
76
    output_html_with_http_headers $input, $cookie, $template->output;
80
    output_html_with_http_headers $input, $cookie, $template->output;
77
    exit;
81
    exit;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt (-1 / +2 lines)
Lines 20-27 Link Here
20
        $("#z3950submit").click(function(){
20
        $("#z3950submit").click(function(){
21
            if (confirm(_("Please note that this Z39.50 search could replace the current record."))){
21
            if (confirm(_("Please note that this Z39.50 search could replace the current record."))){
22
                var strQuery = GetZ3950Terms();
22
                var strQuery = GetZ3950Terms();
23
                var index = "&index=" + "[% index %]";
23
                if(strQuery){
24
                if(strQuery){
24
                    window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl?authid=[% authid %]"+strQuery,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
25
                    window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl?authid=[% authid %]"+strQuery+index,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
25
                }
26
                }
26
            }
27
            }
27
            return false;
28
            return false;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (+6 lines)
Lines 178-183 function addCreateAuthorityButton(tag_subfield_line, heading, tag_index) { Link Here
178
    tag_subfield_line.append(elem);
178
    tag_subfield_line.append(elem);
179
    var tag_subfield_line_a = $('.subfield_line[id^=subfield' + heading.tag + 'a]').eq(tag_index);
179
    var tag_subfield_line_a = $('.subfield_line[id^=subfield' + heading.tag + 'a]').eq(tag_index);
180
    var subfield_a = tag_subfield_line_a.children('.input_marceditor').eq(0);
180
    var subfield_a = tag_subfield_line_a.children('.input_marceditor').eq(0);
181
    var index = subfield_a.attr('id');
181
    elem.click(function() {
182
    elem.click(function() {
182
        var popup = window.open("", "new_auth_popup",'fullscreen,toolbar=false,scrollbars=yes');
183
        var popup = window.open("", "new_auth_popup",'fullscreen,toolbar=false,scrollbars=yes');
183
        if(popup !== null) {
184
        if(popup !== null) {
Lines 203-208 function addCreateAuthorityButton(tag_subfield_line, heading, tag_index) { Link Here
203
                name: 'tagbiblio',
204
                name: 'tagbiblio',
204
                value: heading.tag
205
                value: heading.tag
205
            }));
206
            }));
207
            form.append($('<input>').attr({
208
                type: 'hidden',
209
                name: 'index',
210
                value: index
211
            }));
206
            $('.tag[id^=tag_' + heading.tag + '_]').eq(tag_index).find(':input').each(function(){
212
            $('.tag[id^=tag_' + heading.tag + '_]').eq(tag_index).find(':input').each(function(){
207
                form.append($('<input>').attr({
213
                form.append($('<input>').attr({
208
                    type: 'hidden',
214
                    type: 'hidden',
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt (-2 / +3 lines)
Lines 65-70 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
65
        <form method="post" action="z3950_auth_search.pl" name="f" class="checkboxed">
65
        <form method="post" action="z3950_auth_search.pl" name="f" class="checkboxed">
66
        <input type="hidden" name="op" id="op" value="do_search" />
66
        <input type="hidden" name="op" id="op" value="do_search" />
67
        <input type="hidden" name="authid" value="[% authid %]" />
67
        <input type="hidden" name="authid" value="[% authid %]" />
68
        <input type="hidden" name="index" value="[% index %]" />
68
        <div class="yui-g">
69
        <div class="yui-g">
69
            <div class="yui-u first">
70
            <div class="yui-u first">
70
                <fieldset class="rows">
71
                <fieldset class="rows">
Lines 120-131 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
120
    <tbody>[% FOREACH breeding_loo IN breeding_loop %]
121
    <tbody>[% FOREACH breeding_loo IN breeding_loop %]
121
        [% IF ( breeding_loo.breedingid ) %]
122
        [% IF ( breeding_loo.breedingid ) %]
122
        <tr id="row[% breeding_loo.breedingid %]">
123
        <tr id="row[% breeding_loo.breedingid %]">
123
            <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewMARC">Preview MARC</a> <a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid %]" data-heading_code="[% breeding_loo.heading_code %]" data-authid="[% breeding_loo.authid %]">Import</a><a href="#" id="close_menu" title="Close this menu"> X </a></div> </td>
124
            <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewMARC">Preview MARC</a> <a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid %]" data-heading_code="[% breeding_loo.heading_code %]" data-authid="[% breeding_loo.authid %]" data-index="[% index %]">Import</a><a href="#" id="close_menu" title="Close this menu"> X </a></div> </td>
124
            <td>[% breeding_loo.heading %]</td>
125
            <td>[% breeding_loo.heading %]</td>
125
            <td>[% breeding_loo.heading_code %]</td>
126
            <td>[% breeding_loo.heading_code %]</td>
126
            <td class="actions">
127
            <td class="actions">
127
                <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> Show MARC</a>
128
                <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> Show MARC</a>
128
                <a href="#" class="import_record btn btn-default btn-xs" data-breedingid="[% breeding_loo.breedingid %]" data-heading_code="[% breeding_loo.heading_code %]" data-authid="[% breeding_loo.authid %]"><i class="fa fa-download"></i> Import</a>
129
                <a href="#" class="import_record btn btn-default btn-xs" data-breedingid="[% breeding_loo.breedingid %]" data-heading_code="[% breeding_loo.heading_code %]" data-authid="[% breeding_loo.authid %]" data-index="[% index %]"><i class="fa fa-download"></i> Import</a>
129
            </td>
130
            </td>
130
        </tr>
131
        </tr>
131
        [% END %]
132
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js (-4 / +4 lines)
Lines 1-10 Link Here
1
//z3950_search.js for Authorities, Bib records and Acquisitions module
1
//z3950_search.js for Authorities, Bib records and Acquisitions module
2
function Import(Breeding, recordid, AuthType, FrameworkCode) {
2
function Import(Breeding, recordid, AuthType, FrameworkCode, index) {
3
3
4
    if ( AuthType == false ) {
4
    if ( AuthType == false ) {
5
        opener.document.location="../cataloguing/addbiblio.pl?biblionumber="+recordid+"&z3950=1&frameworkcode="+FrameworkCode+"&breedingid="+Breeding;
5
        opener.document.location="../cataloguing/addbiblio.pl?biblionumber="+recordid+"&z3950=1&frameworkcode="+FrameworkCode+"&breedingid="+Breeding;
6
    } else {
6
    } else {
7
        opener.document.location="../authorities/authorities.pl?breedingid="+Breeding+"&authtypecode="+AuthType+"&authid="+recordid;
7
        opener.document.location="../authorities/authorities.pl?breedingid="+Breeding+"&authtypecode="+AuthType+"&authid="+recordid+"&index="+index;
8
    }
8
    }
9
    window.close();
9
    window.close();
10
    return false;
10
    return false;
Lines 87-96 $( document ).ready( function() { Link Here
87
        var data_authid = $( this ).data( "authid" );
87
        var data_authid = $( this ).data( "authid" );
88
        var data_biblionumber = $( this ).data( "biblionumber" );
88
        var data_biblionumber = $( this ).data( "biblionumber" );
89
        var data_frameworkcode = $( this ).data( "frameworkcode" );
89
        var data_frameworkcode = $( this ).data( "frameworkcode" );
90
        var data_index          = $( this ).data( "index" );
90
        if ( data_headingcode == undefined ) {
91
        if ( data_headingcode == undefined ) {
91
            Import( data_breedingid, data_biblionumber, false , data_frameworkcode );
92
            Import( data_breedingid, data_biblionumber, false , data_frameworkcode );
92
        } else {
93
        } else {
93
            Import( data_breedingid, data_authid, data_headingcode );
94
            Import( data_breedingid, data_authid, data_headingcode, '', data_index  );
94
        }
95
        }
95
        return false;
96
        return false;
96
    });
97
    });
97
- 

Return to bug 11299