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

(-)a/Koha/SharedContent.pm (-1 / +1 lines)
Lines 42-48 sub manaRequest { Link Here
42
42
43
    my $response  = $userAgent->request($mana_request);
43
    my $response  = $userAgent->request($mana_request);
44
44
45
    eval { $result = from_json( $response->decoded_content ); };
45
    eval { $result = from_json( $response->decoded_content, { utf8 => 1} ); };
46
    $result->{code} = $response->code;
46
    $result->{code} = $response->code;
47
    if ( $@ ){
47
    if ( $@ ){
48
        $result->{msg} = $response->{_msg};
48
        $result->{msg} = $response->{_msg};
(-)a/Koha/Subscription.pm (+1 lines)
Lines 119-124 sub get_search_info { Link Here
119
    my $self=shift;
119
    my $self=shift;
120
    my $searched_sub_id = shift;
120
    my $searched_sub_id = shift;
121
    my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
121
    my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
122
    return unless $biblio;
122
    my $biblioitem =
123
    my $biblioitem =
123
      Koha::Biblioitems->find( { 'biblionumber' => $searched_sub_id } );
124
      Koha::Biblioitems->find( { 'biblionumber' => $searched_sub_id } );
124
125
(-)a/installer/data/mysql/atomicupdate/mana_03-add_mana_autoshare.sql (-1 / +1 lines)
Lines 1-2 Link Here
1
INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
1
INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
2
('AutoShareWithMana','subscription','','defines datas automatically shared with mana','multiple');
2
('AutoShareWithMana','','','defines datas automatically shared with mana','multiple');
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc (-1 / +1 lines)
Lines 118-124 jQuery(function($){ Link Here
118
        dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],
118
        dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],
119
        weekHeader: _("Wk"),
119
        weekHeader: _("Wk"),
120
        dateFormat: "[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSIF ( dateformat == "dmydot" ) %]dd.mm.yy[% ELSE %]yy-mm-dd[% END %]",
120
        dateFormat: "[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSIF ( dateformat == "dmydot" ) %]dd.mm.yy[% ELSE %]yy-mm-dd[% END %]",
121
        firstDay: [% Koha.Preference('CalendarFirstDayOfWeek') | html %],
121
        firstDay: '[% Koha.Preference('CalendarFirstDayOfWeek') | html %]',
122
        isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
122
        isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
123
        showMonthAfterYear: false,
123
        showMonthAfterYear: false,
124
        yearSuffix: ''};
124
        yearSuffix: ''};
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc (-1 / +1 lines)
Lines 30-36 Link Here
30
                    [% END %]
30
                    [% END %]
31
                    <input hidden class="rowid" value="[% report.id %]">
31
                    <input hidden class="rowid" value="[% report.id %]">
32
                    <td>[% IF ( report.report_name ) %][% report.report_name %][% END %]</td>
32
                    <td>[% IF ( report.report_name ) %][% report.report_name %][% END %]</td>
33
                    <td title="[% report.savedsql %]"><div>
33
                    <td title="[% report.savedsql |html %]"><div>
34
                        [% IF report.notes.length > 200 %]
34
                        [% IF report.notes.length > 200 %]
35
                            [% report.notes.substr(0,200) %]<a class="showbutton">Show More</a></div><div hidden>
35
                            [% report.notes.substr(0,200) %]<a class="showbutton">Show More</a></div><div hidden>
36
                        [% END %]
36
                        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc (-2 / +1 lines)
Lines 4-10 Link Here
4
[% USE Branches %]
4
[% USE Branches %]
5
5
6
6
7
8
[% IF statuscode == "200" %]
7
[% IF statuscode == "200" %]
9
    <table id="mana_results_datatable" width=100%>
8
    <table id="mana_results_datatable" width=100%>
10
        <thead>
9
        <thead>
Lines 62-68 Link Here
62
        </tbody>
61
        </tbody>
63
    </table>
62
    </table>
64
[% ELSE %]
63
[% ELSE %]
65
    <h4> [% msg %] statuscode: [% statuscode %] </h4>
64
    <h4>Mana search fails with the code: [% statuscode %] </h4>
66
[% END %]
65
[% END %]
67
66
68
<div id="comment_box" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="display: none;">
67
<div id="comment_box" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="display: none;">
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc (+141 lines)
Lines 6-11 Link Here
6
            <ul class="dropdown-menu">
6
            <ul class="dropdown-menu">
7
                <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li>
7
                <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li>
8
                <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li>
8
                <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li>
9
                [% IF Koha.Preference('Mana')==1 %]
10
                <li id="newsql"><a href="" data-toggle="modal" data-target="#mana_search_result">New SQL from Mana</a> </li>
11
                [% END %]
9
            </ul>
12
            </ul>
10
        </div>
13
        </div>
11
    [% END %]
14
    [% END %]
Lines 70-72 Link Here
70
73
71
    [% END %]
74
    [% END %]
72
</div>
75
</div>
76
77
[% IF Koha.Preference('Mana')==1 %]
78
    <div id="mana_search_result" class="modal fade container-fluid" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 100%; left:0%; margin-left: auto; display: none;">
79
        <div class="modal-dialog modal-lg">
80
            <div class="modal-content">
81
                <div class="modal-header">
82
                    <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
83
                    <h3 id="mana_search_result_label"> Mana Search</h3>
84
                </div>
85
                <div>
86
                    <form id="search_form" style="margin-left: 5%">
87
                        Please enter a few key words:
88
                        <input type=text id=mana_search_field>
89
                        <input type=button class="mana_search_button" value="Search">
90
                    </form>
91
                    <div class="modal-body">
92
                    </div>
93
                </div>
94
            </div>
95
        </div>
96
    </div>
97
[% END %]
98
99
<script type="text/javascript">
100
    $(document).ready( function(){
101
        $(".mana_search_button").on("click",function(){
102
            mana_search($("#mana_search_field").val());
103
        });
104
    });
105
106
    $('#search_form').on( "submit", function(event) {
107
        event.preventDefault();
108
        mana_search($(this).children("#mana_search_field").val());
109
    });
110
111
    function mana_increment(mana_id, resourcename, fieldvalue, stepvalue = 1){
112
        $.ajax( {
113
            type: "POST",
114
            url: "/cgi-bin/koha/svc/mana/addvaluetofield",
115
            data: {id: mana_id, field: fieldvalue, resource: resourcename, step: stepvalue},
116
            datatype: "json",
117
        }).done( function() {
118
        }).fail( function(){ alert("") });
119
    }
120
121
    function mana_use( mana_id ){
122
        $.ajax( {
123
            type:"POST",
124
            url: "/cgi-bin/koha/svc/mana/use",
125
            data: {id:mana_id, resource: 'report', saveinbase: 1},
126
            dataType: "json",
127
        })
128
        .done( function (result){
129
            if ( result.errmsg ){
130
                alert( result.errmsg );
131
            }
132
            else{
133
                window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&amp;phase=Show%20SQL&mana_success=1&phase=Edit%20SQL");
134
            }
135
        })
136
        .fail( function ( foo, msg, longmsg, bla ){
137
        });
138
    }
139
140
    function mana_search( textquery ){
141
        $.ajax({
142
            type: "POST",
143
            url: "/cgi-bin/koha/svc/mana/search",
144
            data: {biblionumber: $("#biblionumber").val(), resource: 'report', id: textquery, usecomments: 1},
145
            dataType: "html",
146
        })
147
        .done( function( result ) {
148
            $("#mana_search_result .modal-body").html(result);
149
            $("#mana_search_result_label").text("Results from Mana Knowledge Base");
150
            $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
151
                "sPaginationType":"four_button",
152
                "autoWidth": false,
153
                "columnDefs": [
154
                    { "width": "35%", "targets": 1 }
155
                ],
156
                "aoColumnDefs": [
157
                    { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
158
                    { "sType": "title-string", "aTargets" : [ "title-string" ] },
159
                    { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
160
                ]
161
            }));
162
            if($("td.dataTables_empty").length == 0){
163
                 $("#mana_search").show();
164
            }
165
166
            $( "select[class='actionreport1']" ).show();
167
            $( "button[class='actionreport2']" ).hide();
168
            $("#CommentButton").on("click", function(){
169
                var resource_type = "report";
170
                var target_id = $("#selected_id").val();
171
                var manamsg = $("#manamsg").val();
172
                mana_comment(target_id, manamsg, resource_type);
173
                $("#comment_box").modal("hide");
174
            });
175
176
            $(".showbutton").on("click", function(){
177
                $(this).parent().hide();
178
                $(this).parent().next().show();
179
            });
180
181
            $("a[class='hidebutton']").on("click", function(){
182
                $(this).parent().hide();
183
                $(this).parent().prev().show();
184
            });
185
186
            $("#commentCloseButton").on("click", function(){
187
                $("#comment_box").modal("hide");
188
            });
189
190
            $(".actionreport1").on("click", function(){
191
                $("#selectedcomment").val($(this).val());
192
                $(this).parent("select").hide();
193
                $(this).parent("select").next().show();
194
            });
195
196
            $(".actionreport2").on("click", function(){
197
                $(this).hide();
198
                $(this).prev().show();
199
                mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
200
            });
201
        }).fail( function( result ){
202
        });
203
    }
204
205
    function mana_comment( target_id, manamsg, resource_type ){
206
        $.ajax( {
207
            type: "POST",
208
            url: "/cgi-bin/koha/svc/mana/share",
209
            data: {message: manamsg, resource: resource_type , resource_id: target_id},
210
            datatype: "json",
211
        })
212
    }
213
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-113 / +9 lines)
Lines 145-150 canned reports and writing custom SQL reports.</p> Link Here
145
    </div>
145
    </div>
146
</div>
146
</div>
147
147
148
[% IF report_converted %]
149
    <div class="dialog message">
150
        The report "[% report_converted %]" has been converted.
151
    </div>
152
[% END %]
153
154
148
[% IF ( saved1 ) %]
155
[% IF ( saved1 ) %]
149
[% IF ( savedreports ) %]<h1>Saved reports</h1>
156
[% IF ( savedreports ) %]<h1>Saved reports</h1>
150
157
Lines 186-199 canned reports and writing custom SQL reports.</p> Link Here
186
    </div>
193
    </div>
187
    [% END %]
194
    [% END %]
188
195
189
   [% IF (Koha.Preference('Mana') == 1) %]
190
    <div id="mana_search" class="dialog message">
191
        <p> You want more reports? Check the Mana Knowledge Base <p> <a style="cursor:pointer" data-toggle="modal" data-target="#mana_search_result">Quick Search</a></p>
192
    </div>
193
    [% END %]
194
195
</script>
196
</script>
196
<h1> [% savedreport.sql %]</h1>
197
197
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
198
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
198
<input type="hidden" name="phase" value="Delete Multiple" />
199
<input type="hidden" name="phase" value="Delete Multiple" />
199
        <table id="table_reports">
200
        <table id="table_reports">
Lines 233-239 canned reports and writing custom SQL reports.</p> Link Here
233
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
234
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
234
                                <input type="checkbox" name="ids" value="[% savedreport.id | html %]" />
235
                                <input type="checkbox" name="ids" value="[% savedreport.id | html %]" />
235
                            [% END %]
236
                            [% END %]
236
                        <input hidden class="report_sql" value="[% savedreport.savedsql %]">
237
                        <input hidden class="report_sql" value="[% savedreport.savedsql |html %]">
237
                        </td>
238
                        </td>
238
                        <td class="report_id"><label for="ids">[% savedreport.id | html %]</label></td>
239
                        <td class="report_id"><label for="ids">[% savedreport.id | html %]</label></td>
239
                        <td class="report_name">
240
                        <td class="report_name">
Lines 1135-1144 $(document).ready(function() { Link Here
1135
                window.history.back();
1136
                window.history.back();
1136
            });
1137
            });
1137
1138
1138
            $(".mana_search_button").on("click",function(){
1139
                mana_search($(this).prev().val());
1140
            });
1141
1142
            $(".ShareButton").on("click", function(){
1139
            $(".ShareButton").on("click", function(){
1143
                if($(this).closest("tr").find(".report_notes").text().length < 20 || $(this).closest("tr").find(".report_name").text().length < 20){
1140
                if($(this).closest("tr").find(".report_notes").text().length < 20 || $(this).closest("tr").find(".report_name").text().length < 20){
1144
                    $("#shared_infos").hide();
1141
                    $("#shared_infos").hide();
Lines 1155-1164 $(document).ready(function() { Link Here
1155
                }
1152
                }
1156
            });
1153
            });
1157
1154
1158
            $('#search_form').submit(function () {
1159
                return false;
1160
            });
1161
1162
            $("#addColumn").on("click",function(){
1155
            $("#addColumn").on("click",function(){
1163
                addColumn();
1156
                addColumn();
1164
            });
1157
            });
Lines 1344-1446 $(document).ready(function() { Link Here
1344
                return confirmDelete(MSG_CONFIRM_DELETE);
1337
                return confirmDelete(MSG_CONFIRM_DELETE);
1345
            });
1338
            });
1346
        });
1339
        });
1347
        function mana_increment(mana_id, resourcename, fieldvalue, stepvalue = 1){
1348
            $.ajax( {
1349
                type: "POST",
1350
                url: "/cgi-bin/koha/svc/mana/addvaluetofield",
1351
                data: {id: mana_id, field: fieldvalue, resource: resourcename, step: stepvalue},
1352
                datatype: "json",
1353
            }).done( function() {
1354
            }).fail( function(){ });
1355
        }
1356
1357
        function mana_use( mana_id ){
1358
            $.ajax( {
1359
                type:"POST",
1360
                url: "/cgi-bin/koha/svc/mana/use",
1361
                data: {id:mana_id, resource: 'report', saveinbase: 1},
1362
                dataType: "json",
1363
            })
1364
            .done( function (result){
1365
                window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&amp;phase=Show%20SQL");
1366
            })
1367
            .fail( function ( foo, msg, longmsg){
1368
            });
1369
        }
1370
1371
        function mana_search( textquery ){
1372
            $.ajax({
1373
                type: "POST",
1374
                url: "/cgi-bin/koha/svc/mana/search",
1375
                data: {biblionumber: $("#biblionumber").val(), resource: 'report', id: textquery, usecomments: 1},
1376
                dataType: "html",
1377
            })
1378
            .done( function( result ) {
1379
                $("#mana_search_result .modal-body").html(result);
1380
                $("#mana_search_result_label").text("Results from Mana Knowledge Base");
1381
                $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
1382
                    "sPaginationType":"four_button",
1383
                    "autoWidth": false,
1384
                    "columnDefs": [
1385
                        { "width": "35%", "targets": 1 }
1386
                    ],
1387
                    "aoColumnDefs": [
1388
                        { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
1389
                        { "sType": "title-string", "aTargets" : [ "title-string" ] },
1390
                        { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
1391
                    ]
1392
                }));
1393
                if($("td.dataTables_empty").length == 0){
1394
                     $("#mana_search").show();
1395
                }
1396
1397
                $( "select[class='actionreport1']" ).show();
1398
                $( "button[class='actionreport2']" ).hide();
1399
                $("#CommentButton").on("click", function(){
1400
                    var resource_type = "report";
1401
                    var target_id = $("#selected_id").val();
1402
                    var manamsg = $("#manamsg").val();
1403
                    mana_comment(target_id, manamsg, resource_type);
1404
                    $("#comment_box").modal("hide");
1405
                });
1406
1407
                $(".showbutton").on("click", function(){
1408
                    $(this).parent().hide();
1409
                    $(this).parent().next().show();
1410
                });
1411
1412
                $("a[class='hidebutton']").on("click", function(){
1413
                    $(this).parent().hide();
1414
                    $(this).parent().prev().show();
1415
                });
1416
1417
                $("#commentCloseButton").on("click", function(){
1418
                    $("#comment_box").modal("hide");
1419
                });
1420
1421
                $(".actionreport1").on("click", function(){
1422
                    $("#selectedcomment").val($(this).val());
1423
                    $(this).parent("select").hide();
1424
                    $(this).parent("select").next().show();
1425
                });
1426
1427
                $(".actionreport2").on("click", function(){
1428
                    $(this).hide();
1429
                    $(this).prev().show();
1430
                    mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
1431
                });
1432
            }).fail( function( result ){
1433
            });
1434
        }
1435
1436
        function mana_comment( target_id, manamsg, resource_type ){
1437
            $.ajax( {
1438
                type: "POST",
1439
                url: "/cgi-bin/koha/svc/mana/share",
1440
                data: {message: manamsg, resource: resource_type , resource_id: target_id},
1441
                datatype: "json",
1442
            })
1443
        }
1444
1340
1445
        function addColumn() {
1341
        function addColumn() {
1446
            $("#availableColumns option:selected").clone().appendTo("#selectedColumns").attr("selected", "selected");
1342
            $("#availableColumns option:selected").clone().appendTo("#selectedColumns").attr("selected", "selected");
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-1 / +1 lines)
Lines 296-302 Link Here
296
            </ul>
296
            </ul>
297
            [% IF mana %]
297
            [% IF mana %]
298
                <div id="mana">
298
                <div id="mana">
299
                    [% INCLUDE 'mana-subscription-search-result.inc' %]
299
                    [% INCLUDE 'mana/mana-subscription-search-result.inc' %]
300
                </div>
300
                </div>
301
            [% ELSE %]
301
            [% ELSE %]
302
            <div id="opened">
302
            <div id="opened">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-1 lines)
Lines 216-222 width: 300px; /* not enough for IE7 apparently */ Link Here
216
                [% END %]
216
                [% END %]
217
217
218
                        <div hidden id="mana_search" class="dialog message">
218
                        <div hidden id="mana_search" class="dialog message">
219
                            <p>Subscription found on Mana Knowledge Base:</p><p> <a style="cursor:pointer" data-toggle="modal" data-target="#mana_search_result">Quick fill</a></p>
220
                        </div>
219
                        </div>
221
                        <div id="subscription_form_planning">
220
                        <div id="subscription_form_planning">
222
                            <fieldset class="rows">
221
                            <fieldset class="rows">
(-)a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js (-4 / +13 lines)
Lines 393-398 function show_page_2() { Link Here
393
}
393
}
394
394
395
function mana_search() {
395
function mana_search() {
396
    $("#mana_search").html("<p>Mana kb is being asked for your subscription..</p>");
397
    $("#mana_search").show();
398
396
    $.ajax({
399
    $.ajax({
397
        type: "POST",
400
        type: "POST",
398
        url: "/cgi-bin/koha/svc/mana/search",
401
        url: "/cgi-bin/koha/svc/mana/search",
Lines 416-423 function mana_search() { Link Here
416
            ]
419
            ]
417
        }));
420
        }));
418
        if( $("#mana_results_datatable").length && $("td.dataTables_empty").length == 0){
421
        if( $("#mana_results_datatable").length && $("td.dataTables_empty").length == 0){
419
            $("#mana_search").show();
422
            $("#mana_search").html("<p>Subscription found on Mana Knowledge Base:</p><p> <a style='cursor:pointer' data-toggle='modal' data-target='#mana_search_result'>Quick fill</a></p>");
423
        }
424
        else if ( $("#mana_results_datatable").length ){
425
            $("#mana_search").html("<p>No subscription found on Mana Knowledge Base :(</p><p> Please feel free to share you pattern with all others librarians once you are done</p>");
420
        }
426
        }
427
        else{
428
            $("#mana_search").html( result );
429
        }
430
        $("#mana_search").show();
421
        $( "select[class='actionreport1']" ).show();
431
        $( "select[class='actionreport1']" ).show();
422
        $( "button[class='actionreport2']" ).hide();
432
        $( "button[class='actionreport2']" ).hide();
423
433
Lines 446-451 function mana_search() { Link Here
446
        });
456
        });
447
457
448
    }).fail(function(result){
458
    }).fail(function(result){
459
        console.log( msg );
460
        console.log( longmsg );
449
    });
461
    });
450
}
462
}
451
463
Lines 548-556 function removeDisabledAttr() { Link Here
548
560
549
$(document).ready(function() {
561
$(document).ready(function() {
550
    mana_search();
562
    mana_search();
551
    $("#myid").on("click", function(){
552
        debugger;
553
    })
554
    $("#displayexample").hide();
563
    $("#displayexample").hide();
555
    $("#mana_search_result").modal("hide");
564
    $("#mana_search_result").modal("hide");
556
    $("#aqbooksellerid").on('keypress', function(e) {
565
    $("#aqbooksellerid").on('keypress', function(e) {
(-)a/reports/guided_reports.pl (+1 lines)
Lines 182-187 elsif ( $phase eq 'Show SQL'){ Link Here
182
        'notes'      => $report->notes,
182
        'notes'      => $report->notes,
183
        'sql'     => $report->savedsql,
183
        'sql'     => $report->savedsql,
184
        'showsql' => 1,
184
        'showsql' => 1,
185
        'mana_success' => $input->param('mana_success'),
185
    );
186
    );
186
}
187
}
187
188
(-)a/serials/serials-search.pl (+3 lines)
Lines 96-101 for my $field ( @$additional_fields ) { Link Here
96
96
97
my $expiration_date_dt = $expiration_date ? dt_from_string( $expiration_date ) : undef;
97
my $expiration_date_dt = $expiration_date ? dt_from_string( $expiration_date ) : undef;
98
my @subscriptions;
98
my @subscriptions;
99
my $mana_statuscode;
99
if ($searched){
100
if ($searched){
100
    if ($mana) {
101
    if ($mana) {
101
        my $result = Koha::SharedContent::manaGetRequest("subscription",{
102
        my $result = Koha::SharedContent::manaGetRequest("subscription",{
Lines 104-109 if ($searched){ Link Here
104
            ean          => $EAN,
105
            ean          => $EAN,
105
            publisher    => $publisher
106
            publisher    => $publisher
106
        });
107
        });
108
        $mana_statuscode = $result->{code};
107
        @subscriptions = @{ $result->{data} };
109
        @subscriptions = @{ $result->{data} };
108
    }
110
    }
109
    else {
111
    else {
Lines 127-132 if ($searched){ Link Here
127
if ($mana) {
129
if ($mana) {
128
    $template->param(
130
    $template->param(
129
        subscriptions => \@subscriptions,
131
        subscriptions => \@subscriptions,
132
        statuscode    => $mana_statuscode,
130
        total         => scalar @subscriptions,
133
        total         => scalar @subscriptions,
131
        title_filter  => $title,
134
        title_filter  => $title,
132
        ISSN_filter   => $ISSN,
135
        ISSN_filter   => $ISSN,
(-)a/serials/subscription-add.pl (-1 / +1 lines)
Lines 304-310 sub manage_subscription_numbering_pattern_id { Link Here
304
            return $existing->id;
304
            return $existing->id;
305
        }
305
        }
306
306
307
        $params->{label} = Koha::Subscription::Numberpattern->uniqueLabel($query->param('patternname'));
307
        $params->{label} = Koha::Subscription::Numberpatterns->uniqueLabel($query->param('patternname'));
308
        $params->{description} = $query->param('sndescription');
308
        $params->{description} = $query->param('sndescription');
309
309
310
310
(-)a/svc/mana/share (-1 / +19 lines)
Lines 45-47 $content->{resource_id} = $input->param("resource_id"); Link Here
45
$content->{resource_type} = $input->param("resource");
45
$content->{resource_type} = $input->param("resource");
46
$content->{message} = $input->param("message");
46
$content->{message} = $input->param("message");
47
Koha::SharedContent::manaPostRequest('resource_comment', $content);
47
Koha::SharedContent::manaPostRequest('resource_comment', $content);
48
- 
48
    my $package = "Koha::".ucfirst($input->param('resource'));
49
    my $resource;
50
    my $result;
51
eval{
52
    $result = Koha::SharedContent::manaGetRequestWithId($input->param('resource'), $input->param('id') );
53
};
54
if ( $@ or $result->{code} == 500 ){
55
    $resource->{errmsg} =  "Error: mana access got broken, please try again later\n\n ( error: $@ )";
56
}
57
else{
58
    if ( $input->param( 'saveinbase' )) {
59
        $resource = { id => $package->new_from_mana($result->{data})->id };
60
    }
61
    else{
62
        $resource = $result->{data};
63
    }
64
}
65
66
print(to_json($resource));

Return to bug 17047