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 61-66 sub get_search_info { Link Here
61
    my $self=shift;
61
    my $self=shift;
62
    my $searched_sub_id = shift;
62
    my $searched_sub_id = shift;
63
    my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
63
    my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
64
    return unless $biblio;
64
    my $biblioitem =
65
    my $biblioitem =
65
      Koha::Biblioitems->find( { 'biblionumber' => $searched_sub_id } );
66
      Koha::Biblioitems->find( { 'biblionumber' => $searched_sub_id } );
66
67
(-)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') %],
121
        firstDay: '[% Koha.Preference('CalendarFirstDayOfWeek') %]',
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 68-70 Link Here
68
71
69
    [% END %]
72
    [% END %]
70
</div>
73
</div>
74
75
[% IF Koha.Preference('Mana')==1 %]
76
    <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;">
77
        <div class="modal-dialog modal-lg">
78
            <div class="modal-content">
79
                <div class="modal-header">
80
                    <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
81
                    <h3 id="mana_search_result_label"> Mana Search</h3>
82
                </div>
83
                <div>
84
                    <form id="search_form" style="margin-left: 5%">
85
                        Please enter a few key words:
86
                        <input type=text id=mana_search_field>
87
                        <input type=button class="mana_search_button" value="Search">
88
                    </form>
89
                    <div class="modal-body">
90
                    </div>
91
                </div>
92
            </div>
93
        </div>
94
    </div>
95
[% END %]
96
97
<script type="text/javascript">
98
    $(document).ready( function(){
99
        $(".mana_search_button").on("click",function(){
100
            mana_search($("#mana_search_field").val());
101
        });
102
    });
103
104
    $('#search_form').on( "submit", function(event) {
105
        event.preventDefault();
106
        mana_search($(this).children("#mana_search_field").val());
107
    });
108
109
    function mana_increment(mana_id, resourcename, fieldvalue, stepvalue = 1){
110
        $.ajax( {
111
            type: "POST",
112
            url: "/cgi-bin/koha/svc/mana/addvaluetofield",
113
            data: {id: mana_id, field: fieldvalue, resource: resourcename, step: stepvalue},
114
            datatype: "json",
115
        }).done( function() {
116
        }).fail( function(){ alert("") });
117
    }
118
119
    function mana_use( mana_id ){
120
        $.ajax( {
121
            type:"POST",
122
            url: "/cgi-bin/koha/svc/mana/use",
123
            data: {id:mana_id, resource: 'report', saveinbase: 1},
124
            dataType: "json",
125
        })
126
        .done( function (result){
127
            if ( result.errmsg ){
128
                alert( result.errmsg );
129
            }
130
            else{
131
                window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&amp;phase=Show%20SQL&mana_success=1&phase=Edit%20SQL");
132
            }
133
        })
134
        .fail( function ( foo, msg, longmsg, bla ){
135
        });
136
    }
137
138
    function mana_search( textquery ){
139
        $.ajax({
140
            type: "POST",
141
            url: "/cgi-bin/koha/svc/mana/search",
142
            data: {biblionumber: $("#biblionumber").val(), resource: 'report', id: textquery, usecomments: 1},
143
            dataType: "html",
144
        })
145
        .done( function( result ) {
146
            $("#mana_search_result .modal-body").html(result);
147
            $("#mana_search_result_label").text("Results from Mana Knowledge Base");
148
            $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
149
                "sPaginationType":"four_button",
150
                "autoWidth": false,
151
                "columnDefs": [
152
                    { "width": "35%", "targets": 1 }
153
                ],
154
                "aoColumnDefs": [
155
                    { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
156
                    { "sType": "title-string", "aTargets" : [ "title-string" ] },
157
                    { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
158
                ]
159
            }));
160
            if($("td.dataTables_empty").length == 0){
161
                 $("#mana_search").show();
162
            }
163
164
            $( "select[class='actionreport1']" ).show();
165
            $( "button[class='actionreport2']" ).hide();
166
            $("#CommentButton").on("click", function(){
167
                var resource_type = "report";
168
                var target_id = $("#selected_id").val();
169
                var manamsg = $("#manamsg").val();
170
                mana_comment(target_id, manamsg, resource_type);
171
                $("#comment_box").modal("hide");
172
            });
173
174
            $(".showbutton").on("click", function(){
175
                $(this).parent().hide();
176
                $(this).parent().next().show();
177
            });
178
179
            $("a[class='hidebutton']").on("click", function(){
180
                $(this).parent().hide();
181
                $(this).parent().prev().show();
182
            });
183
184
            $("#commentCloseButton").on("click", function(){
185
                $("#comment_box").modal("hide");
186
            });
187
188
            $(".actionreport1").on("click", function(){
189
                $("#selectedcomment").val($(this).val());
190
                $(this).parent("select").hide();
191
                $(this).parent("select").next().show();
192
            });
193
194
            $(".actionreport2").on("click", function(){
195
                $(this).hide();
196
                $(this).prev().show();
197
                mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
198
            });
199
        }).fail( function( result ){
200
        });
201
    }
202
203
    function mana_comment( target_id, manamsg, resource_type ){
204
        $.ajax( {
205
            type: "POST",
206
            url: "/cgi-bin/koha/svc/mana/share",
207
            data: {message: manamsg, resource: resource_type , resource_id: target_id},
208
            datatype: "json",
209
        })
210
    }
211
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-113 / +9 lines)
Lines 150-155 canned reports and writing custom SQL reports.</p> Link Here
150
    </div>
150
    </div>
151
</div>
151
</div>
152
152
153
[% IF report_converted %]
154
    <div class="dialog message">
155
        The report "[% report_converted %]" has been converted.
156
    </div>
157
[% END %]
158
159
153
[% IF ( saved1 ) %]
160
[% IF ( saved1 ) %]
154
[% IF ( savedreports ) %]<h1>Saved reports</h1>
161
[% IF ( savedreports ) %]<h1>Saved reports</h1>
155
162
Lines 174-187 canned reports and writing custom SQL reports.</p> Link Here
174
    </div>
181
    </div>
175
    [% END %]
182
    [% END %]
176
183
177
   [% IF (Koha.Preference('Mana') == 1) %]
178
    <div id="mana_search" class="dialog message">
179
        <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>
180
    </div>
181
    [% END %]
182
183
</script>
184
</script>
184
<h1> [% savedreport.sql %]</h1>
185
185
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
186
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
186
<input type="hidden" name="phase" value="Delete Multiple" />
187
<input type="hidden" name="phase" value="Delete Multiple" />
187
        <table id="table_reports">
188
        <table id="table_reports">
Lines 213-219 canned reports and writing custom SQL reports.</p> Link Here
213
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
214
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
214
                                <input type="checkbox" name="ids" value="[% savedreport.id %]" />
215
                                <input type="checkbox" name="ids" value="[% savedreport.id %]" />
215
                            [% END %]
216
                            [% END %]
216
                        <input hidden class="report_sql" value="[% savedreport.savedsql %]">
217
                        <input hidden class="report_sql" value="[% savedreport.savedsql |html %]">
217
                        </td>
218
                        </td>
218
                        <td class="report_id"><label for="ids">[% savedreport.id %]</label></td>
219
                        <td class="report_id"><label for="ids">[% savedreport.id %]</label></td>
219
                        <td class="report_name">
220
                        <td class="report_name">
Lines 1117-1126 Sub report:<select name="subreport"> Link Here
1117
                window.history.back();
1118
                window.history.back();
1118
            });
1119
            });
1119
1120
1120
            $(".mana_search_button").on("click",function(){
1121
                mana_search($(this).prev().val());
1122
            });
1123
1124
            $(".ShareButton").on("click", function(){
1121
            $(".ShareButton").on("click", function(){
1125
                if($(this).closest("tr").find(".report_notes").text().length < 20 || $(this).closest("tr").find(".report_name").text().length < 20){
1122
                if($(this).closest("tr").find(".report_notes").text().length < 20 || $(this).closest("tr").find(".report_name").text().length < 20){
1126
                    $("#shared_infos").hide();
1123
                    $("#shared_infos").hide();
Lines 1137-1146 Sub report:<select name="subreport"> Link Here
1137
                }
1134
                }
1138
            });
1135
            });
1139
1136
1140
            $('#search_form').submit(function () {
1141
                return false;
1142
            });
1143
1144
            $("#addColumn").on("click",function(){
1137
            $("#addColumn").on("click",function(){
1145
                addColumn();
1138
                addColumn();
1146
            });
1139
            });
Lines 1325-1427 Sub report:<select name="subreport"> Link Here
1325
                return confirmDelete(MSG_CONFIRM_DELETE);
1318
                return confirmDelete(MSG_CONFIRM_DELETE);
1326
            });
1319
            });
1327
        });
1320
        });
1328
        function mana_increment(mana_id, resourcename, fieldvalue, stepvalue = 1){
1329
            $.ajax( {
1330
                type: "POST",
1331
                url: "/cgi-bin/koha/svc/mana/addvaluetofield",
1332
                data: {id: mana_id, field: fieldvalue, resource: resourcename, step: stepvalue},
1333
                datatype: "json",
1334
            }).done( function() {
1335
            }).fail( function(){ });
1336
        }
1337
1338
        function mana_use( mana_id ){
1339
            $.ajax( {
1340
                type:"POST",
1341
                url: "/cgi-bin/koha/svc/mana/use",
1342
                data: {id:mana_id, resource: 'report', saveinbase: 1},
1343
                dataType: "json",
1344
            })
1345
            .done( function (result){
1346
                window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&amp;phase=Show%20SQL");
1347
            })
1348
            .fail( function ( foo, msg, longmsg){
1349
            });
1350
        }
1351
1352
        function mana_search( textquery ){
1353
            $.ajax({
1354
                type: "POST",
1355
                url: "/cgi-bin/koha/svc/mana/search",
1356
                data: {biblionumber: $("#biblionumber").val(), resource: 'report', id: textquery, usecomments: 1},
1357
                dataType: "html",
1358
            })
1359
            .done( function( result ) {
1360
                $("#mana_search_result .modal-body").html(result);
1361
                $("#mana_search_result_label").text("Results from Mana Knowledge Base");
1362
                $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
1363
                    "sPaginationType":"four_button",
1364
                    "autoWidth": false,
1365
                    "columnDefs": [
1366
                        { "width": "35%", "targets": 1 }
1367
                    ],
1368
                    "aoColumnDefs": [
1369
                        { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
1370
                        { "sType": "title-string", "aTargets" : [ "title-string" ] },
1371
                        { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
1372
                    ]
1373
                }));
1374
                if($("td.dataTables_empty").length == 0){
1375
                     $("#mana_search").show();
1376
                }
1377
1378
                $( "select[class='actionreport1']" ).show();
1379
                $( "button[class='actionreport2']" ).hide();
1380
                $("#CommentButton").on("click", function(){
1381
                    var resource_type = "report";
1382
                    var target_id = $("#selected_id").val();
1383
                    var manamsg = $("#manamsg").val();
1384
                    mana_comment(target_id, manamsg, resource_type);
1385
                    $("#comment_box").modal("hide");
1386
                });
1387
1388
                $(".showbutton").on("click", function(){
1389
                    $(this).parent().hide();
1390
                    $(this).parent().next().show();
1391
                });
1392
1393
                $("a[class='hidebutton']").on("click", function(){
1394
                    $(this).parent().hide();
1395
                    $(this).parent().prev().show();
1396
                });
1397
1398
                $("#commentCloseButton").on("click", function(){
1399
                    $("#comment_box").modal("hide");
1400
                });
1401
1402
                $(".actionreport1").on("click", function(){
1403
                    $("#selectedcomment").val($(this).val());
1404
                    $(this).parent("select").hide();
1405
                    $(this).parent("select").next().show();
1406
                });
1407
1408
                $(".actionreport2").on("click", function(){
1409
                    $(this).hide();
1410
                    $(this).prev().show();
1411
                    mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
1412
                });
1413
            }).fail( function( result ){
1414
            });
1415
        }
1416
1417
        function mana_comment( target_id, manamsg, resource_type ){
1418
            $.ajax( {
1419
                type: "POST",
1420
                url: "/cgi-bin/koha/svc/mana/share",
1421
                data: {message: manamsg, resource: resource_type , resource_id: target_id},
1422
                datatype: "json",
1423
            })
1424
        }
1425
1321
1426
        function addColumn() {
1322
        function addColumn() {
1427
            $("#availableColumns option:selected").clone().appendTo("#selectedColumns").attr("selected", "selected");
1323
            $("#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 114-120 Link Here
114
                        </ul>
114
                        </ul>
115
                        [% IF mana %]
115
                        [% IF mana %]
116
                            <div id="mana">
116
                            <div id="mana">
117
                                [% INCLUDE 'mana-subscription-search-result.inc' %]
117
                                [% INCLUDE 'mana/mana-subscription-search-result.inc' %]
118
                            </div>
118
                            </div>
119
                        [% ELSE %]
119
                        [% ELSE %]
120
            <div id="opened">
120
            <div id="opened">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-1 lines)
Lines 214-220 width: 300px; /* not enough for IE7 apparently */ Link Here
214
                [% END %]
214
                [% END %]
215
215
216
                        <div hidden id="mana_search" class="dialog message">
216
                        <div hidden id="mana_search" class="dialog message">
217
                            <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>
218
                        </div>
217
                        </div>
219
                        <div id="subscription_form_planning">
218
                        <div id="subscription_form_planning">
220
                            <fieldset class="rows">
219
                            <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 181-186 elsif ( $phase eq 'Show SQL'){ Link Here
181
        'notes'      => $report->{notes},
181
        'notes'      => $report->{notes},
182
	'sql'     => $report->{savedsql},
182
	'sql'     => $report->{savedsql},
183
	'showsql' => 1,
183
	'showsql' => 1,
184
        'mana_success' => $input->param('mana_success'),
184
    );
185
    );
185
}
186
}
186
187
(-)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