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

(-)a/Koha/Report.pm (+82 lines)
Line 0 Link Here
1
package Koha::Report;
2
3
# Copyright 2017 Biblibre Baptiste Wojtkowski
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
use JSON;
26
use Koha::Reports;
27
28
use base qw(Koha::Object);
29
30
=head1 NAME
31
32
Koha::Report - Koha Report Object Class
33
34
=head1 Ap
35
36
=head2 Class Methods
37
38
=cut
39
40
=head3 type
41
42
=cut
43
44
sub get_search_info {
45
    my $self=shift;
46
    my $sub_mana_info = { 'query' => shift };
47
    return $sub_mana_info;
48
}
49
50
sub get_sharable_info{
51
    my $self=shift;
52
    my $shared_report_id=shift;
53
    my $report = Koha::Reports->find($shared_report_id);
54
    my $sub_mana_info = {
55
        'savedsql' => $report->savedsql,
56
        'report_name' => $report->report_name,
57
        'notes' => $report->notes,
58
        'report_group' => $report->report_group,
59
        'type' => $report->type,
60
    };
61
    return $sub_mana_info;
62
}
63
64
sub new_from_mana{
65
    my $self = shift;
66
    my $data = shift;
67
    delete $data->{exportemail};
68
    delete $data->{kohaversion};
69
    delete $data->{creationdate};
70
    delete $data->{lastimport};
71
    $data->{mana_id} = $data->{id};
72
    delete $data->{id};
73
    delete $data->{nbofusers};
74
    delete $data->{language};
75
    Koha::Report->new($data)->store;
76
}
77
78
sub _type {
79
    return 'SavedSql';
80
}
81
82
1;
(-)a/Koha/Reports.pm (+58 lines)
Line 0 Link Here
1
package Koha::Reports;
2
3
# Copyright 2017 Biblibre Baptiste Wojtkowski
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Report;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Serial - Koha Serial Object class
33
34
=head1 API
35
36
=head2 Class Methods
37
38
=cut
39
40
=head3 type
41
42
=cut
43
44
sub _type {
45
    return 'SavedSql';
46
}
47
48
sub object_class {
49
    return 'Koha::Report';
50
}
51
52
=head1 AUTHOR
53
54
Kyle M Hall <kyle@bywatersolutions.com>
55
56
=cut
57
58
1;
(-)a/Koha/SharedContent.pm (-5 / +61 lines)
Lines 22-28 use JSON; Link Here
22
use HTTP::Request;
22
use HTTP::Request;
23
use LWP::UserAgent;
23
use LWP::UserAgent;
24
24
25
our $MANA_IP = "http://10.25.159.107:5000";
25
use Koha::Serials;
26
use Koha::Reports;
27
28
our $MANA_IP = C4::Context->config('mana_config');
26
29
27
sub manaRequest {
30
sub manaRequest {
28
    my $mana_request = shift;
31
    my $mana_request = shift;
Lines 40-51 sub manaRequest { Link Here
40
    return $result if ( $response->code =~ /^2..$/ );
43
    return $result if ( $response->code =~ /^2..$/ );
41
}
44
}
42
45
43
sub manaNewUserPatchRequest {
46
sub manaIncrementRequest {
44
    my $resource = shift;
47
    my $resource = shift;
45
    my $id       = shift;
48
    my $id       = shift;
46
49
    my $field    = shift;
47
    my $url = "$MANA_IP/$resource/$id.json/newUser";
50
    my $step     = shift;
48
    my $request = HTTP::Request->new( PATCH => $url );
51
    my $param;
52
    $param->{step} = $step || 1;
53
    $param->{id} = $id;
54
    $param->{resource} = $resource;
55
    $param = join '&',
56
       map { defined $param->{$_} ? $_ . "=" . $param->{$_} : () }
57
           keys %$param;
58
    my $url = "$MANA_IP/$resource/$id.json/increment/$field?$param";
59
    my $request = HTTP::Request->new( POST => $url );
49
60
50
    return manaRequest($request);
61
    return manaRequest($request);
51
}
62
}
Lines 64-69 sub manaPostRequest { Link Here
64
    return manaRequest($request);
75
    return manaRequest($request);
65
}
76
}
66
77
78
sub manaShareInfos{
79
    my ($query, $loggedinuser, $ressourceid, $ressourcetype) = @_;
80
    my $mana_language;
81
    if ( $query->param('mana_language') ) {
82
        $mana_language = $query->param('mana_language');
83
    }
84
    else {
85
        my $result = $mana_language = C4::Context->preference('language');
86
    }
87
88
    my $mana_email;
89
    if ( $loggedinuser ne 0 ) {
90
        my $borrower = Koha::Patrons->find($loggedinuser);
91
        $mana_email = $borrower->email
92
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
93
        $mana_email = $borrower->emailpro
94
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
95
        $mana_email =
96
          Koha::Libraries->find( C4::Context->userenv->{'branch'} )->branchemail
97
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
98
    }
99
    $mana_email = C4::Context->preference('KohaAdminEmailAddress')
100
      if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
101
    my %versions = C4::Context::get_versions();
102
103
    my $mana_info = {
104
        language    => $mana_language,
105
        kohaversion => $versions{'kohaVersion'},
106
        exportemail => $mana_email
107
    };
108
    my ($ressource, $ressource_mana_info);
109
    my $packages = "Koha::".ucfirst($ressourcetype)."s";
110
    my $package = "Koha::".ucfirst($ressourcetype);
111
    $ressource_mana_info = $package->get_sharable_info($ressourceid);
112
    $ressource_mana_info = { %$ressource_mana_info, %$mana_info };
113
    $ressource = $packages->find($ressourceid);
114
115
    my $result = Koha::SharedContent::manaPostRequest( $ressourcetype,
116
        $ressource_mana_info );
117
    if ( $result and ($result->{code} eq "200" or $result->{code} eq "201") ) {
118
        $ressource->set( { mana_id => $result->{id} } )->store;
119
    }
120
    return $result;
121
}
122
67
sub manaGetRequestWithId {
123
sub manaGetRequestWithId {
68
    my $resource = shift;
124
    my $resource = shift;
69
    my $id       = shift;
125
    my $id       = shift;
(-)a/Koha/Subscription.pm (+2 lines)
Lines 46-51 Koha::Subscription - Koha Subscription Object class Link Here
46
=cut
46
=cut
47
47
48
sub get_search_info {
48
sub get_search_info {
49
    my $self=shift;
49
    my $searched_sub_id = shift;
50
    my $searched_sub_id = shift;
50
    my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
51
    my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
51
    my $biblioitem =
52
    my $biblioitem =
Lines 61-66 sub get_search_info { Link Here
61
}
62
}
62
63
63
sub get_sharable_info {
64
sub get_sharable_info {
65
    my $self = shift;
64
    my $shared_sub_id = shift;
66
    my $shared_sub_id = shift;
65
    my $subscription  = Koha::Subscriptions->find($shared_sub_id);
67
    my $subscription  = Koha::Subscriptions->find($shared_sub_id);
66
    my $biblio        = Koha::Biblios->find( $subscription->biblionumber );
68
    my $biblio        = Koha::Biblios->find( $subscription->biblionumber );
(-)a/etc/koha-conf.xml (+4 lines)
Lines 149-154 __PAZPAR2_TOGGLE_XML_POST__ Link Here
149
 <!-- Path to the config file for SMS::Send -->
149
 <!-- Path to the config file for SMS::Send -->
150
 <sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>
150
 <sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>
151
151
152
 <!-- URL of the mana KB server -->
153
 <!-- alternative value http://mana-test.koha-community.org to query the test server -->
154
 <mana_config>http://mana-kb.koha-community.org</mana_config>
155
152
 <!-- Configuration for Plack -->
156
 <!-- Configuration for Plack -->
153
 <plack_max_requests>50</plack_max_requests>
157
 <plack_max_requests>50</plack_max_requests>
154
 <plack_workers>2</plack_workers>
158
 <plack_workers>2</plack_workers>
(-)a/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql (+1 lines)
Line 1 Link Here
1
ALTER TABLE subscription ADD mana_id int(11);
1
ALTER TABLE subscription ADD mana_id int(11);
2
ALTER TABLE saved_sql ADD mana_id int(11);
(-)a/installer/data/mysql/atomicupdate/mana_02-add_Mana_syspref.sql (-1 / +1 lines)
Line 1 Link Here
1
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('Mana', '1', 'request to Mana Webservice. Mana centralize commun information between other Koha to facilitate the creation of new subscriptions, vendors, report queries etc... You can search, share, import and comment the content of Mana.', NULL, 'YesNo');
1
INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('Mana','2', 0|1|2,'request to Mana Webservice. Mana centralize commun information between other Koha to facilitate the creation of new subscriptions, vendors, report queries etc... You can search, share, import and comment the content of Mana.','Choice');
(-)a/installer/data/mysql/atomicupdate/mana_03-add_mana_autoshare.sql (+2 lines)
Line 0 Link Here
1
INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
2
('AutoShareWithMana','subscription','','defines datas automatically shared with mana','multiple');
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 60-65 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
60
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
60
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
61
('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
61
('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
62
('AutoEmailPrimaryAddress','OFF','email|emailpro|B_email|cardnumber|OFF','Defines the default email address where \'Account Details\' emails are sent.','Choice'),
62
('AutoEmailPrimaryAddress','OFF','email|emailpro|B_email|cardnumber|OFF','Defines the default email address where \'Account Details\' emails are sent.','Choice'),
63
('AutoShareWithMana','subscription','','defines datas automatically shared with mana','multiple'),
63
('AutoLocation','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff client from unauthorized IP addresses','YesNo'),
64
('AutoLocation','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff client from unauthorized IP addresses','YesNo'),
64
('AutomaticItemReturn','1',NULL,'If ON, Koha will automatically set up a transfer of this item to its homebranch','YesNo'),
65
('AutomaticItemReturn','1',NULL,'If ON, Koha will automatically set up a transfer of this item to its homebranch','YesNo'),
65
('autoMemberNum','1','','If ON, patron number is auto-calculated','YesNo'),
66
('autoMemberNum','1','','If ON, patron number is auto-calculated','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+6 lines)
Lines 291-296 table+table { Link Here
291
.highlighted-row,
291
.highlighted-row,
292
.highlighted-row td { background-color: #FFD000 !important }
292
.highlighted-row td { background-color: #FFD000 !important }
293
293
294
.warned-row,
295
.warned-row td { background-color: #FF9000 !important }
296
297
.high-warned-row,
298
.high-warned-row td { background-color: #FF0000 !important }
299
294
tbody tr:nth-child(odd) td {
300
tbody tr:nth-child(odd) td {
295
	background-color : #F3F3F3;
301
	background-color : #F3F3F3;
296
    border : 1px solid #BCBCBC;
302
    border : 1px solid #BCBCBC;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana-subscription-search-result.inc (-46 lines)
Lines 1-46 Link Here
1
[% USE KohaDates %]
2
<table id="mana_results_datatable">
3
    <thead>
4
        <tr>
5
            <th>ISSN</th>
6
            <th class="anti-the">Title</th>
7
            <th>Frequency</th>
8
            <th>Numbering pattern</th>
9
            <th class="NoSort">Number of users</th>
10
            <th class="title-string">Last Import</th>
11
            [% UNLESS search_only %]
12
              <th class="NoSort">Actions</th>
13
            [% END %]
14
        </tr>
15
    </thead>
16
    <tfoot>
17
        <tr>
18
            <td><input type="text" class="dt-filter" data-column_num="0" placeholder="Search ISSN" /></td>
19
            <td><input type="text" class="dt-filter" data-column_num="1" placeholder="Search title" /></td>
20
            <td><input type="text" class="dt-filter" data-column_num="2" placeholder="Search frequency" /></td>
21
            <td><input type="text" class="dt-filter" data-column_num="3" placeholder="Search numbering pattern" /></td>
22
            <td></td>
23
            <td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search last import" /></td>
24
            [% UNLESS search_only %]
25
              <td></td>
26
            [% END %]
27
        </tr>
28
    </tfoot>
29
    <tbody>
30
        [% FOREACH subscription IN subscriptions %]
31
            [% UNLESS subscription.cannotdisplay %]
32
                <tr id="row[% subscription.subscriptionid %]">
33
                    <td>[% IF ( subscription.issn ) %][% subscription.issn %][% END %]</td>
34
                    <td>[% subscription.title %]</a></td>
35
                    <td>[% IF ( subscription.sfdescription ) %][% subscription.sfdescription %][% END %]</td>
36
                    <td>[% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod %][% END %]</td>
37
                    <td>[% IF ( subscription.nbofusers ) %][% subscription.nbofusers %][% END %]</td>
38
                    <td><span title="[% subscription.lastimport %]">[% subscription.lastimport | $KohaDates %]</span></td>
39
                    [% UNLESS search_only %]
40
                      <td><a style="cursor:pointer" onclick="mana_use([% subscription.id %])"> <i class="fa fa-inbox"></i> Use</a></td>
41
                    [% END %]
42
                </tr>
43
            [% END %]
44
        [% END %]
45
    </tbody>
46
</table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc (+83 lines)
Line 0 Link Here
1
[% USE KohaDates %]
2
[% USE Koha %]
3
[% USE AuthorisedValues %]
4
[% USE Branches %]
5
6
<table id="mana_results_datatable" width=100%>
7
    <thead>
8
        <tr>
9
            <th>Report Name</th>
10
            <th class="anti-the" width=35%>Notes</th>
11
            <th>Type</th>
12
            <th title="number of libraries using this pattern"># of users</th>
13
            <th class="title-string" title="last time a library used this pattern">Last import</th>
14
            <th> Comments </th>
15
            [% UNLESS search_only %]
16
              <th class="NoSort">Actions</th>
17
            [% END %]
18
        </tr>
19
    </thead>
20
    <tbody>
21
        [% FOREACH report IN reports %]
22
            [% UNLESS report.cannotdisplay %]
23
                <tr id="row[% report.id %]"
24
                     [% IF report.nbofcomment > highWarned  %]
25
                        class = "high-warned-row"
26
                     [% ELSIF report.nbofcomment > warned  %]
27
                        class = "warned-row"
28
                     [% ELSIF report.nbofcomment > lowWarned  %]
29
                        class = "highlighted-row"
30
                     [% END %]
31
                >
32
                    <input hidden class="rowid" value="[% report.id %]">
33
                    <td>[% IF ( report.report_name ) %][% report.report_name %][% END %]</td>
34
                    <td title="[% report.savedsql %]"><div>
35
                        [% IF report.notes.length > 200 %]
36
                            [% report.notes.substr(0,200) %]<a class="showbutton">Show More</a></div><div hidden>
37
                        [% END %]
38
                            [% report.notes %]
39
                        [% IF report.notes.length > 200 %]
40
                            <a class="hidebutton">Show Less</a></div> </td>
41
                        [% END %]
42
                    <td> [% report.type %] </td>
43
                    <td>[% IF ( report.nbofusers ) %][% report.nbofusers %][% END %]</td>
44
                    <td><span title="[% report.lastimport %]">[% report.lastimport | $KohaDates %]</span></td>
45
		    <td>[% FOREACH comment IN report.comments %][% comment.message %] ([% comment.nb %]) <br>[% END %]</td>
46
47
                    [% UNLESS search_only %]
48
                      <td>
49
                          <button onclick="mana_use([% report.id %])"> <i class="fa fa-inbox"></i> Use</button>
50
                          <input hidden type="text" id="selectedcomment">
51
                          <select>
52
                              <option selected disabled>Report mistake</option>
53
                              [% FOREACH comment IN report.comments %]
54
                                  <option class="actionreport1" value="[% comment.id %]" onclick="mana_increment('[% comment.id %]', 'resource_comment', 'nb')"> [% comment.message %] ([% comment.nb %])
55
                              [% END %]
56
                                  <option data-toggle="modal" onclick="($('#selected_id').val($('.rowid').val()))" data-target="#comment_box"> other
57
                          </select>
58
                          <button hidden class="actionreport2" hidden> Cancel</button>
59
                      </td>
60
                    [% END %]
61
                </tr>
62
            [% END %]
63
        [% END %]
64
    </tbody>
65
</table>
66
67
<div id="comment_box" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="display: none;">
68
    <div class="modal-dialog modal-lg" style="width: 30%">
69
        <div class="modal-content" style="">
70
            <div class="modal-header">
71
                <button type="button" id="commentCloseButton" class="closebtn"  aria-hidden="true">×</button>
72
                <h3 id="mana_submit_comment"> Please enter a new commment (max 35 caracters)</h3>
73
            </div>
74
            <div class="modal-body">
75
                <form>
76
                    <input hidden id="selected_id" value="">
77
                    <input type="text" id="manamsg">
78
                </form>
79
                <button id="CommentButton"> Comment </button>
80
            </div>
81
        </div>
82
    </div>
83
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc (+82 lines)
Line 0 Link Here
1
[% USE KohaDates %]
2
[% USE Koha %]
3
[% USE AuthorisedValues %]
4
[% USE Branches %]
5
6
7
8
<table id="mana_results_datatable" width=100%>
9
    <thead>
10
        <tr>
11
            <th>ISSN</th>
12
            <th class="anti-the" width=50%>Title</th>
13
            <th> Published by </th>
14
            <th>Frequency</th>
15
            <th>Numbering pattern</th>
16
            <th title="number of libraries using this pattern"># of users</th>
17
            <th class="title-string" title="last time a library used this pattern">Last import</th>
18
            <th> Comments </th>
19
            [% UNLESS search_only %]
20
              <th class="NoSort">Actions</th>
21
            [% END %]
22
        </tr>
23
    </thead>
24
    <tbody>
25
        [% FOREACH subscription IN subscriptions %]
26
            [% UNLESS subscription.cannotdisplay %]
27
                <tr id="row[% subscription.subscriptionid %]"
28
                     [% IF subscription.nbofcomment > highWarned  %]
29
                        class = "high-warned-row" title="this resource has been reported more than [% highWarned %] times, take care!"
30
                     [% ELSIF subscription.nbofcomment > warned  %]
31
                        class = "warned-row" title="this resource has been reported more than [% warned %] times, take care!"
32
                     [% ELSIF subscription.nbofcomment > lowWarned  %]
33
                        class = "highlighted-row" title="this resource has been reported more than [% lowWarned %] times, take care!"
34
                     [% END %]
35
                >
36
                <input hidden class="rowid" value="[% subscription.id %]">
37
                    <td>[% IF ( subscription.issn ) %][% subscription.issn %][% END %]</td>
38
                    <td>[% subscription.title %]</a></td>
39
                    <td>[% IF ( subscription.publishercode ) %][% subscription.publishercode %][% END %]</td>
40
                    <td>[% IF ( subscription.sfdescription ) %][% subscription.sfdescription %][% END %]</td>
41
                    <td>[% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod %][% END %]</td>
42
                    <td>[% IF ( subscription.nbofusers ) %][% subscription.nbofusers %][% END %]</td>
43
                    <td><span title="[% subscription.lastimport %]">[% subscription.lastimport | $KohaDates %]</span></td>
44
		    <td>[% FOREACH comment IN subscription.comments %][% comment.message %] ([% comment.nb %]) <br>[% END %]</td>
45
46
                    [% UNLESS search_only %]
47
                      <td>
48
                          <button onclick="mana_use([% subscription.id %])"> <i class="fa fa-inbox"></i> Use</button>
49
                          <input hidden type="text" id="selectedcomment">
50
                          <select>
51
                              <option selected disabled>Report mistake</option>
52
                              [% FOREACH comment IN subscription.comments %]
53
                                  <option class="actionreport1" value="[% comment.id %]" onclick="mana_increment('[% comment.id %]', 'resource_comment', 'nb')"> [% comment.message %] ([% comment.nb %])
54
                              [% END %]
55
                                  <option data-toggle="modal" onclick="($('#selected_id').val($('.rowid').val()))" data-target="#comment_box"> other
56
                          </select>
57
                          <button hidden class="actionreport2" hidden> Cancel</button>
58
                      </td>
59
                    [% END %]
60
                </tr>
61
            [% END %]
62
        [% END %]
63
    </tbody>
64
</table>
65
66
<div id="comment_box" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="display: none;">
67
    <div class="modal-dialog modal-lg" style="width: 30%">
68
        <div class="modal-content" style="">
69
            <div class="modal-header">
70
                <button type="button" id="commentCloseButton" class="closebtn" aria-hidden="true">×</button>
71
                <h3 id="mana_submit_comment"> Please enter a new commment (max 35 caracters)</h3>
72
            </div>
73
            <div class="modal-body">
74
                <form>
75
                    <input hidden id="selected_id" value="">
76
                    <input type="text" id="manamsg"> Comment:
77
                </form>
78
                <button id="CommentButton"> Comment </button>
79
            </div>
80
        </div>
81
    </div>
82
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (-9 / +7 lines)
Lines 46-56 Link Here
46
            [% ELSE %]
46
            [% ELSE %]
47
                <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
47
                <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
48
            [% END %]
48
            [% END %]
49
            [% IF Koha.Preference('Mana') %]
49
            [% IF Koha.Preference('Mana') and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %]
50
                [% IF one_language_enabled==0 or mana_id %]
50
                [% IF one_language_enabled==0 or mana_id %]
51
                    <div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Your email address will be associated to your sharing." data-target="#mana_share_modal" class="btn btn-small"><i class="fa fa-share-alt"></i> Share</a></div>
51
                    <div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Share the subscription with other librairies. Your email address will be associated to your sharing." data-target="#mana_share_modal" class="btn btn-default btn-sm"><i class="fa fa-share-alt"></i> Share</a></div>
52
                [% ELSE %]
52
                [% ELSE %]
53
                    <div class="btn-group" data-toggle="tooltip" title="Your email address will be associated to your sharing."><a class="btn btn-small" onclick="share()"><i class="fa fa-share-alt"></i> Share</a></div>
53
                    <div class="btn-group" data-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing."><a class="btn btn-default btn-sm" onclick="share()"><i class="fa fa-share-alt"></i> Share</a></div>
54
                [% END %]
54
                [% END %]
55
            [% END %]
55
            [% END %]
56
        [% END %]
56
        [% END %]
Lines 119-136 Link Here
119
            <div class="modal-body">
119
            <div class="modal-body">
120
                [% IF (mana_id) %]
120
                [% IF (mana_id) %]
121
                    <div class="alert">
121
                    <div class="alert">
122
                        <p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwide it will do nothing.</p>
122
                        <p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>
123
                    </div>
123
                    </div>
124
                [% END %]
124
                [% END %]
125
                [% IF ( languages_loop ) %]
125
                [% IF ( languages_loop ) %]
126
                    [% UNLESS ( one_language_enabled ) %]
126
                    [% UNLESS ( one_language_enabled ) %]
127
                        <div class="rows">
127
                        <div class="rows">
128
                            <p>The frequency and the numberpattern of [% bibliotitle %] are :</p>
128
                                <li><span class="label">Frequency: </span>
129
                            <ol>
130
                                <li><span class="label">Frequency : </span>
131
                                        [% frequency.description %]
129
                                        [% frequency.description %]
132
                                </li>
130
                                </li>
133
                                <li><span class="label">Number pattern : </span>
131
                                <li><span class="label">Number pattern: </span>
134
                                    [% numberpattern.label %]
132
                                    [% numberpattern.label %]
135
                                </li>
133
                                </li>
136
                            </ol>
134
                            </ol>
Lines 138-144 Link Here
138
                        <div class="rows">
136
                        <div class="rows">
139
                            <form method="get" id="mana_share_form" action="/cgi-bin/koha/serials/subscription-detail.pl" class="validated" >
137
                            <form method="get" id="mana_share_form" action="/cgi-bin/koha/serials/subscription-detail.pl" class="validated" >
140
                                <fieldset>
138
                                <fieldset>
141
                                    <label for="mana_language">Language of your sharing :</label>
139
                                    <label for="mana_language">Language:</label>
142
                                    <select id="mana_language" name="mana_language">
140
                                    <select id="mana_language" name="mana_language">
143
                                        [% FOREACH languages_loo IN languages_loop %]
141
                                        [% FOREACH languages_loo IN languages_loop %]
144
                                            [% IF ( languages_loo.group_enabled ) %]
142
                                            [% IF ( languages_loo.group_enabled ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (+8 lines)
Lines 12-17 Link Here
12
<div id="doc" class="yui-t7">
12
<div id="doc" class="yui-t7">
13
    <div id="bd">
13
    <div id="bd">
14
        <div id="yui-main" class="sysprefs">
14
        <div id="yui-main" class="sysprefs">
15
            [% IF ( Koha.Preference('Mana') == 2) %]
16
                <fieldset>
17
                    <p><center> You haven't decided if you want to activate Mana Knowlede Base, please let us know by clicking<center></p>
18
                    <a href=/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=request+to+mana+webservice><center>Here</center></a>
19
                </fieldset>
20
           [% END %]
21
22
15
            <div class="yui-g"><h1>Koha administration</h1></div>
23
            <div class="yui-g"><h1>Koha administration</h1></div>
16
            <div class="yui-g">
24
            <div class="yui-g">
17
25
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref (-3 / +9 lines)
Lines 51-59 Web services: Link Here
51
        -
51
        -
52
            - pref: Mana
52
            - pref: Mana
53
              choices:
53
              choices:
54
                  yes: Enable
54
                  0: Disable
55
                  no: Disable
55
                  1: Enable
56
            - request to Mana Webservice. Mana centralize commun information between other Koha to facilitate the creation of new subscriptions, vendors, report queries etc... You can search, share, import and comment the content of Mana.
56
                  2: No, let me think about it
57
            - request to Mana Webservice. Mana centralize commun information between other Koha to facilitate the creation of new subscriptions, vendors, report queries etc... You can search, share, import and comment the content of Mana. The informations shared with Mana KB are shared under the CC-0 license. More infos about CC-0 license on https://creativecommons.org/choose/zero/
58
        -
59
            - 'Fields automatically shared with mana'
60
            - pref: AutoShareWithMana
61
              multiple:
62
                subscription: Subscriptions
57
    Reporting:
63
    Reporting:
58
        -
64
        -
59
            - Only return
65
            - Only return
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/mana/mana-report-search-result.tt (+1 lines)
Line 0 Link Here
1
[% INCLUDE 'mana/mana-report-search-result.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/mana/mana-subscription-search-result.tt (+1 lines)
Line 0 Link Here
1
[% INCLUDE 'mana/mana-subscription-search-result.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-7 / +284 lines)
Lines 74-79 function load_group_subgroups () { Link Here
74
    }
74
    }
75
}
75
}
76
76
77
function share() {
78
    window.location="/cgi-bin/koha/reports/guided_reports.pl?phase=Save";
79
}
80
77
$(document).ready(function(){
81
$(document).ready(function(){
78
    $('#limit').change(function() {
82
    $('#limit').change(function() {
79
        $('#limitselect').submit();
83
        $('#limitselect').submit();
Lines 84-89 $(".goback").on("click",function(e){ Link Here
84
    window.history.back();
88
    window.history.back();
85
});
89
});
86
90
91
$(".mana_search_button").on("click",function(){
92
    mana_search($(this).prev().val());
93
});
94
95
$(".ShareButton").on("click", function(){
96
    if($(this).closest("tr").find(".report_notes").text().length < 20 || $(this).closest("tr").find(".report_name").text().length < 20){
97
        $("#shared_infos").hide();
98
        $("#ManaShareButton").hide();
99
        $("#noterror").show();
100
    }
101
    else{
102
        $("#shared_id").html($(this).closest("tr").find(".report_id").text());
103
        $("#shared_name").html($(this).closest("tr").find(".report_name").text());
104
        $("#shared_sql").html($(this).closest("tr").find(".report_sql").val());
105
        $("#shared_type").html($(this).closest("tr").find(".report_type").text());
106
        $("#shared_group").html($(this).closest("tr").find(".report_group").text());
107
        $("#shared_notes").html($(this).closest("tr").find(".report_notes").text());
108
    }
109
});
110
111
$('#search_form').submit(function () {
112
    return false;
113
});
114
87
$("#addColumn").on("click",function(){
115
$("#addColumn").on("click",function(){
88
    addColumn();
116
    addColumn();
89
});
117
});
Lines 265-271 $("#delColumn").on("click",function(){ Link Here
265
    });
293
    });
266
[% END %]
294
[% END %]
267
});
295
});
268
//]]>
296
297
function mana_increment(mana_id, resourcename, fieldvalue, stepvalue = 1){
298
    $.ajax( {
299
        type: "POST",
300
        url: "/cgi-bin/koha/svc/mana/addvaluetofield",
301
        data: {id: mana_id, field: fieldvalue, resource: resourcename, step: stepvalue},
302
        datatype: "json",
303
    }).done( function() {
304
    }).fail( function(){ });
305
}
306
307
function mana_use( mana_id ){
308
    $.ajax( {
309
        type:"POST",
310
        url: "/cgi-bin/koha/svc/mana/use",
311
        data: {id:mana_id, resource: 'report', saveinbase: 1},
312
        dataType: "json",
313
    })
314
    .done( function (result){
315
        window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&amp;phase=Show%20SQL");
316
    })
317
    .fail( function ( foo, msg, longmsg){
318
    });
319
}
320
321
function mana_search( textquery ){
322
    $.ajax({
323
        type: "POST",
324
        url: "/cgi-bin/koha/svc/mana/search",
325
        data: {biblionumber: $("#biblionumber").val(), resource: 'report', id: textquery, usecomments: 1},
326
        dataType: "html",
327
    })
328
    .done( function( result ) {
329
        $("#mana_search_result .modal-body").html(result);
330
        $("#mana_search_result_label").text("Results from Mana Knowledge Base");
331
        $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
332
            "sPaginationType":"four_button",
333
            "autoWidth": false,
334
            "columnDefs": [
335
                { "width": "35%", "targets": 1 }
336
            ],
337
            "aoColumnDefs": [
338
                { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
339
                { "sType": "title-string", "aTargets" : [ "title-string" ] },
340
                { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
341
            ]
342
        }));
343
        if($("td.dataTables_empty").length == 0){
344
             $("#mana_search").show();
345
        }
346
347
        $( "select[class='actionreport1']" ).show();
348
        $( "button[class='actionreport2']" ).hide();
349
        $("#CommentButton").on("click", function(){
350
            var resource_type = "report";
351
            var target_id = $("#selected_id").val();
352
            var manamsg = $("#manamsg").val();
353
            mana_comment(target_id, manamsg, resource_type);
354
            $("#comment_box").modal("hide");
355
        });
356
357
        $(".showbutton").on("click", function(){
358
            $(this).parent().hide();
359
            $(this).parent().next().show();
360
        });
361
362
        $("a[class='hidebutton']").on("click", function(){
363
            $(this).parent().hide();
364
            $(this).parent().prev().show();
365
        });
366
367
        $("#commentCloseButton").on("click", function(){
368
            $("#comment_box").modal("hide");
369
        });
370
371
        $(".actionreport1").on("click", function(){
372
            $("#selectedcomment").val($(this).val());
373
            $(this).parent("select").hide();
374
            $(this).parent("select").next().show();
375
        });
376
377
        $(".actionreport2").on("click", function(){
378
            $(this).hide();
379
            $(this).prev().show();
380
            mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
381
        });
382
    }).fail( function( result ){
383
    });
384
}
385
386
function mana_comment( target_id, manamsg, resource_type ){
387
    $.ajax( {
388
        type: "POST",
389
        url: "/cgi-bin/koha/svc/mana/share",
390
        data: {message: manamsg, resource: resource_type , resource_id: target_id},
391
        datatype: "json",
392
    })
393
}
394
395
396
269
</script>
397
</script>
270
</head>
398
</head>
271
<body id="rep_guided_reports_start" class="rep">
399
<body id="rep_guided_reports_start" class="rep">
Lines 355-360 canned reports and writing custom SQL reports.</p> Link Here
355
    </div>
483
    </div>
356
[% END %]
484
[% END %]
357
485
486
<div id="mana_search_result" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 100%; left:0%; margin-left: auto; display: none;">
487
    <div class="modal-dialog modal-lg">
488
        <div class="modal-content">
489
            <div class="modal-header">
490
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
491
                <h3 id="mana_search_result_label"> Mana Search</h3>
492
            </div>
493
            <div>
494
                <form id="search_form" style="margin-left: 5%">
495
                    Please enter a few key words:
496
                    <input type=text id=mana_search_field>
497
                    <input type=button class="mana_search_button" value="Search">
498
                </form>
499
                <div class="modal-body">
500
                </div>
501
            </div>
502
        </div>
503
    </div>
504
</div>
505
358
[% IF ( saved1 ) %]
506
[% IF ( saved1 ) %]
359
[% IF ( savedreports ) %]<h1>Saved reports</h1>
507
[% IF ( savedreports ) %]<h1>Saved reports</h1>
360
508
Lines 372-377 canned reports and writing custom SQL reports.</p> Link Here
372
                <option value="">All</option>
520
                <option value="">All</option>
373
            </select>
521
            </select>
374
        </div>
522
        </div>
523
<div style="display:inline-block">
524
    [% IF (manamsg == 'success') %]
525
     <div id="mana_search" class="dialog message">
526
        <p> Shared successfully! Thanks for your help.</p>
527
    </div>
528
    [% ELSIF (manamsg == 'fail') %]
529
     <div id="mana_search" class="dialog message">
530
        <p> An error occured while sharing, please try again later.</p>
531
    </div>
532
    [% END %]
533
534
   [% IF (Koha.Preference('Mana') == 1) %]
535
    <div id="mana_search" class="dialog message">
536
        <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>
537
    </div>
538
    [% END %]
539
540
</script>
541
<h1> [% savedreport.sql %]</h1>
375
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
542
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
376
<input type="hidden" name="phase" value="Delete Multiple" />
543
<input type="hidden" name="phase" value="Delete Multiple" />
377
        <table id="table_reports">
544
        <table id="table_reports">
Lines 398-420 canned reports and writing custom SQL reports.</p> Link Here
398
            <tbody>
565
            <tbody>
399
                [% FOREACH savedreport IN savedreports %]
566
                [% FOREACH savedreport IN savedreports %]
400
                    [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
567
                    [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
401
                        <td>
568
                        <td class="report_checkbox">
402
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
569
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
403
                                <input type="checkbox" name="ids" value="[% savedreport.id %]" />
570
                                <input type="checkbox" name="ids" value="[% savedreport.id %]" />
404
                            [% END %]
571
                            [% END %]
572
                        <input hidden class="report_sql" value="[% savedreport.savedsql %]">
405
                        </td>
573
                        </td>
406
                        <td><label for="ids">[% savedreport.id %]</label></td>
574
                        <td class="report_id"><label for="ids">[% savedreport.id %]</label></td>
407
                        <td>
575
                        <td class="report_name">
408
                            [% IF ( savedreport.report_name ) %]
576
                            [% IF ( savedreport.report_name ) %]
409
                                [% savedreport.report_name %]
577
                                [% savedreport.report_name %]
410
                            [% ELSE %]
578
                            [% ELSE %]
411
                                [ no name ]
579
                                [ no name ]
412
                            [% END %]
580
                            [% END %]
413
                        </td>
581
                        </td>
414
                        <td>[% savedreport.type %]</td>
582
                        <td class="report_type">[% savedreport.type %]</td>
415
                        <td>[% savedreport.groupname %]</td>
583
                        <td class="report_group">[% savedreport.groupname %]</td>
416
                        <td>[% savedreport.subgroupname %]</td>
584
                        <td>[% savedreport.subgroupname %]</td>
417
                        <td>[% savedreport.notes %]</td>
585
                        <td class="report_notes">[% savedreport.notes %]</td>
418
                        <td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
586
                        <td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
419
                        <td><span title="[% savedreport.date_created %]">[% savedreport.date_created | $KohaDates %]</span></td>
587
                        <td><span title="[% savedreport.date_created %]">[% savedreport.date_created | $KohaDates %]</span></td>
420
                        <td><span title="[% savedreport.last_modified %]">[% savedreport.last_modified | $KohaDates with_hours => 1 %]</span></td>
588
                        <td><span title="[% savedreport.last_modified %]">[% savedreport.last_modified | $KohaDates with_hours => 1 %]</span></td>
Lines 454-459 canned reports and writing custom SQL reports.</p> Link Here
454
                                            <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a></li>
622
                                            <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a></li>
455
                                            <li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]"><i class="fa fa-copy"></i> Duplicate</a></li>
623
                                            <li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]"><i class="fa fa-copy"></i> Duplicate</a></li>
456
                                        [% END %]
624
                                        [% END %]
625
                                        [% IF (Koha.Preference('Mana') == 1) %]
626
                                            <li><a class="ShareButton" data-toggle="modal" href="#mana_share_report" title="Share your report with Mana Knowledge Base"><i class="fa fa-share-alt"></i> Share</a></li>
627
                                        [% END %]
457
                                        <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
628
                                        <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
458
                                        [% IF ( CAN_user_reports_delete_reports ) %]
629
                                        [% IF ( CAN_user_reports_delete_reports ) %]
459
                                            <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li>
630
                                            <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li>
Lines 466-471 canned reports and writing custom SQL reports.</p> Link Here
466
                [% END %]
637
                [% END %]
467
            </tbody>
638
            </tbody>
468
        </table>
639
        </table>
640
</div>
469
        [% IF ( CAN_user_reports_delete_reports ) %]
641
        [% IF ( CAN_user_reports_delete_reports ) %]
470
        <fieldset class="action">
642
        <fieldset class="action">
471
            <input type="submit" value="Delete selected" />
643
            <input type="submit" value="Delete selected" />
Lines 506-511 canned reports and writing custom SQL reports.</p> Link Here
506
[% END %]
678
[% END %]
507
[% END %]
679
[% END %]
508
680
681
<div id="mana_share_report" class="modal fade" tabindex="-1" role="dialog" arialabelledby="mana_share_modal_label" style="display: none;">
682
    <div class="modal-dialog">
683
        <div class="modal-content">
684
            <div class="modal-header">
685
                <h3 id="mana_share_modal_label">Share with Mana</h3>
686
            </div>
687
            <div class="modal-body">
688
                [% IF (mana_id) %]
689
                    <div class="alert">
690
                        <p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>
691
                    </div>
692
                [% END %]
693
                [% IF ( languages_loop ) %]
694
                    [% UNLESS ( one_language_enabled ) %]
695
                        <label id="noteerror" type="hidden">Please enter a report name and descriptive note before sharing (minimum 20 characters)</label>
696
                        <div id="shared_infos" class="rows">
697
                                <li> <span class="label">Id: </span><div id="shared_id"></div>
698
                                </li>
699
                                <li> <span class="label">Name: </span><div id="shared_name"></div>
700
                                </li>
701
                                <li> <span class="label">SQL: </span><div id="shared_sql"></div>
702
                                </li>
703
                                <li> <span class="label">Group: </span><div id="shared_group"></div>
704
                                </li>
705
                                <li> <span class="label">Type: </span><div id="shared_type"></div>
706
                                </li>
707
                                <li> <span class="label">Notes: </span><div id="shared_notes"></div>
708
                                </li>
709
710
                        </div>
711
                        <div class="rows">
712
                            <form method="post" id="mana_share_form" action="/cgi-bin/koha/reports/guided_reports.pl?phase=Share" class="validated" >
713
                                <input type="hidden" name="phase" value="Share">
714
715
                                <fieldset>
716
                                    <label for="mana_language">Language:</label>
717
                                    <select id="mana_language" name="mana_language">
718
                                        [% FOREACH languages_loo IN languages_loop %]
719
                                            [% IF ( languages_loo.group_enabled ) %]
720
                                                [% IF ( languages_loo.plural ) %]
721
                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
722
                                                        [% IF ( sublanguages_loo.enabled ) %]
723
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
724
                                                                <option value="[% languages_loo.rfc4646_subtag %]" selected>
725
                                                                    [% sublanguages_loo.native_description %]
726
                                                                    [% sublanguages_loo.script_description %]
727
                                                                    [% sublanguages_loo.region_description %]
728
729
                                                                    [% sublanguages_loo.variant_description %]
730
                                                                    ([% sublanguages_loo.rfc4646_subtag %])
731
                                                                </option>
732
                                                            [% ELSE %]
733
                                                                <option value="[% languages_loo.rfc4646_subtag %]">
734
                                                                    [% sublanguages_loo.native_description %]
735
                                                                    [% sublanguages_loo.script_description %]
736
                                                                    [% sublanguages_loo.region_description %]
737
                                                                    [% sublanguages_loo.variant_description %]
738
                                                                    ([% sublanguages_loo.rfc4646_subtag %])
739
                                                                </option>
740
                                                            [% END %]
741
                                                        [% END %]
742
                                                    [% END %]
743
                                                [% ELSE %]
744
                                                    [% IF ( languages_loo.group_enabled ) %]
745
                                                        [% IF ( languages_loo.current ) %]
746
                                                            <option value="[% languages_loo.rfc4646_subtag %]" selected>
747
                                                                [% IF ( languages_loo.native_description ) %]
748
                                                                    [% languages_loo.native_description %]
749
                                                                [% ELSE %]
750
                                                                    [% languages_loo.rfc4646_subtag %]
751
                                                                [% END %]
752
                                                            </option>
753
                                                        [% ELSE %]
754
                                                            <option value="[% languages_loo.rfc4646_subtag %]">
755
                                                                [% IF ( languages_loo.native_description ) %]
756
                                                                    [% languages_loo.native_description %]
757
                                                                [% ELSE %]
758
                                                                    [% languages_loo.rfc4646_subtag %]
759
                                                                [% END %]
760
                                                            </option>
761
                                                        [% END %]
762
                                                    [% END %]
763
                                                [% END %]
764
                                            [% END %]
765
                                        [% END %]
766
                                    </select>
767
                                    <input type="hidden" id="reportid" name="reportid" value="[% savedreport.id %]"/>
768
                                </fieldset>
769
                            </form>
770
                        </div>
771
                    [% END %]
772
                [% END %]
773
            </div>
774
            <div class="modal-footer">
775
                <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
776
                [% IF one_language_enabled==0 %]
777
                    <button id="ManaShareButton" type="submit" form="mana_share_form" class="btn btn-primary">Share</button>
778
                [% ELSE %]
779
                    <div id="ManaShareButton" class="btn-group"><a class="btn btn-primary"'onclick="share()">Share</a></div>
780
                [% END %]
781
            </div>
782
        </div>
783
    </div>
784
</div>
785
509
786
510
[% IF ( build1 ) %]
787
[% IF ( build1 ) %]
511
[% IF ( cache_error) %]
788
[% IF ( cache_error) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/mana-subscription-search-result.tt (-1 lines)
Line 1 Link Here
1
[% INCLUDE 'mana-subscription-search-result.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-10 / +76 lines)
Lines 409-422 function mana_search() { Link Here
409
    $.ajax({
409
    $.ajax({
410
        type: "POST",
410
        type: "POST",
411
        url: "/cgi-bin/koha/svc/mana/search",
411
        url: "/cgi-bin/koha/svc/mana/search",
412
        data: {biblionumber : $("#biblionumber").val()},
412
        data: {id: $("#biblionumber").val(), resource: 'subscription', usecomments: 1},
413
        dataType: "html",
413
        dataType: "html",
414
    })
414
    })
415
    .done( function( result ) {
415
    .done( function( result ) {
416
    $("#mana_search_result .modal-body").html(result);
416
        $("#mana_search_result .modal-body").html(result);
417
        $("#mana_search_result_label").text("Results from Mana");
417
        $("#mana_search_result_label").text("Results from Mana Knowledge Base");
418
        $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
418
        $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
419
            "sPaginationType": "four_button",
419
            "sPaginationType": "four_button",
420
            "order":[[4, "desc"], [5, "desc"]],
421
            "autoWidth": false,
422
            "columnDefs": [
423
                { "width": "35%", "targets": 1 }
424
            ],
420
            "aoColumnDefs": [
425
            "aoColumnDefs": [
421
                { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
426
                { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
422
                { "sType": "title-string", "aTargets" : [ "title-string" ] },
427
                { "sType": "title-string", "aTargets" : [ "title-string" ] },
Lines 426-442 function mana_search() { Link Here
426
        if($("td.dataTables_empty").length == 0){
431
        if($("td.dataTables_empty").length == 0){
427
            $("#mana_search").show();
432
            $("#mana_search").show();
428
        }
433
        }
434
        $( "select[class='actionreport1']" ).show();
435
        $( "button[class='actionreport2']" ).hide();
436
437
        $("#CommentButton").on("click", function(){
438
            var resource_type = "subscription";
439
            var target_id = $("#selected_id").val();
440
            var manamsg = $("#manamsg").val();
441
            mana_comment(target_id, manamsg, resource_type);
442
            $("#comment_box").modal("hide");
443
        });
444
445
        $("#commentCloseButton").on("click", function(){
446
            $("#comment_box").modal("hide");
447
        });
448
449
        $(".actionreport1").on("click", function(){
450
            $("#selectedcomment").val($(this).val());
451
            $(this).parent("select").hide();
452
            $(this).parent("select").next().show();
453
        });
454
455
        $(".actionreport2").on("click", function(){
456
            $(this).hide();
457
            $(this).prev().show();
458
            mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
459
        });
460
429
    }).fail(function(result){
461
    }).fail(function(result){
430
    });
462
    });
431
}
463
}
432
464
465
function mana_comment( target_id, manamsg, resource_type ){
466
    $.ajax( {
467
        type: "POST",
468
        url: "/cgi-bin/koha/svc/mana/share",
469
        data: {message: manamsg, resource: resource_type , resource_id: target_id},
470
        datatype: "json",
471
    })
472
}
473
474
function mana_increment(mana_id, resource, fieldvalue, stepvalue = 1){
475
    $.ajax( {
476
        type: "POST",
477
        url: "/cgi-bin/koha/svc/mana/addvaluetofield",
478
        data: {id: mana_id, resource: resource, field: fieldvalue, step: stepvalue},
479
        datatype: "json",
480
    })
481
}
482
433
function mana_use(mana_id){
483
function mana_use(mana_id){
434
    $("tr").removeClass("selected");
484
    $("tr").removeClass("selected");
435
    $("#row"+mana_id).addClass("selected");
485
    $("#row"+mana_id).addClass("selected");
436
    $.ajax( {
486
    $.ajax( {
437
        type: "POST",
487
        type: "POST",
438
        url: "/cgi-bin/koha/svc/mana/use",
488
        url: "/cgi-bin/koha/svc/mana/use",
439
        data: {id : mana_id},
489
        data: {id: mana_id, resource: 'subscription'},
440
        dataType: "json",
490
        dataType: "json",
441
    })
491
    })
442
    .done(function(result){
492
    .done(function(result){
Lines 511-516 function removeDisabledAttr() { Link Here
511
561
512
562
513
$(document).ready(function() {
563
$(document).ready(function() {
564
565
566
567
568
    mana_search();
569
    $("#myid").on("click", function(){
570
        debugger;
571
    })
514
    $("#displayexample").hide();
572
    $("#displayexample").hide();
515
    $("#mana_search_result").modal("hide");
573
    $("#mana_search_result").modal("hide");
516
    $("#aqbooksellerid").on('keypress', function(e) {
574
    $("#aqbooksellerid").on('keypress', function(e) {
Lines 619-625 $(document).ready(function() { Link Here
619
    });
677
    });
620
    $("#subscription_add_next").on("click",function(){
678
    $("#subscription_add_next").on("click",function(){
621
        if ( Check_page1() ) {
679
        if ( Check_page1() ) {
622
            [% IF Koha.Preference('Mana') %]
680
            [% IF Koha.Preference('Mana')== 1 %]
623
                mana_search();
681
                mana_search();
624
            [% END %]
682
            [% END %]
625
            show_page_2();
683
            show_page_2();
Lines 649-654 $(document).ready(function() { Link Here
649
        e.preventDefault();
707
        e.preventDefault();
650
        testPredictionPattern();
708
        testPredictionPattern();
651
    });
709
    });
710
711
652
});
712
});
653
//]]>
713
//]]>
654
</script>
714
</script>
Lines 845-852 $(document).ready(function() { Link Here
845
905
846
                <div id="page_2">
906
                <div id="page_2">
847
                    <div class="yui-u first">
907
                    <div class="yui-u first">
908
                [% IF ( Koha.Preference('Mana') == 2) %]
909
                    <fieldset>
910
                        <p><center>You haven't activated the Mana Knowledge Base, click
911
                        <a href=/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=request+to+mana+webservice>here</a>
912
                         to configure.</center></p>
913
                    </fieldset>
914
                [% END %]
915
848
                        <div id="mana_search" class="dialog message">
916
                        <div id="mana_search" class="dialog message">
849
                            <p>Frequency and Numbering pattern have been already proposed for this subscription on Mana. To show results, click <a style="cursor:pointer" data-toggle="modal" data-target="#mana_search_result">Here</a></p>
917
                            <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>
850
                        </div>
918
                        </div>
851
                        <div id="subscription_form_planning">
919
                        <div id="subscription_form_planning">
852
                            <fieldset class="rows">
920
                            <fieldset class="rows">
Lines 1134-1150 $(document).ready(function() { Link Here
1134
    </div>
1202
    </div>
1135
</div>
1203
</div>
1136
1204
1137
<div id="mana_search_result" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 90%; left:5%; margin-left: auto; display: none;">
1205
<div id="mana_search_result" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 100%; left:0%; margin-left: auto; display: none;">
1138
    <div class="modal-dialog modal-lg">
1206
    <div class="modal-dialog modal-lg">
1139
        <div class="modal-content">
1207
        <div class="modal-content">
1140
            <div class="modal-header">
1208
            <div class="modal-header">
1209
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
1141
                <h3 id="mana_search_result_label"></h3>
1210
                <h3 id="mana_search_result_label"></h3>
1142
            </div>
1211
            </div>
1143
            <div class="modal-body">
1212
            <div class="modal-body">
1144
            </div>
1213
            </div>
1145
            <div class="modal-footer">
1146
                <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
1147
            </div>
1148
        </div>
1214
        </div>
1149
    </div>
1215
    </div>
1150
</div>
1216
</div>
(-)a/reports/guided_reports.pl (-1 / +12 lines)
Lines 37-42 use Koha::AuthorisedValues; Link Here
37
use Koha::BiblioFrameworks;
37
use Koha::BiblioFrameworks;
38
use Koha::Libraries;
38
use Koha::Libraries;
39
use Koha::Patron::Categories;
39
use Koha::Patron::Categories;
40
use Koha::SharedContent;
40
41
41
=head1 NAME
42
=head1 NAME
42
43
Lines 144-149 elsif ( $phase eq 'Build new' ) { Link Here
144
        }
145
        }
145
    }
146
    }
146
    $template->param(
147
    $template->param(
148
        'manamsg' => $input->param('manamsg')||'',
147
        'saved1' => 1,
149
        'saved1' => 1,
148
        'savedreports' => $reports,
150
        'savedreports' => $reports,
149
        'usecache' => $usecache,
151
        'usecache' => $usecache,
Lines 539-545 elsif ( $phase eq 'Build report' ) { Link Here
539
541
540
elsif ( $phase eq 'Save' ) {
542
elsif ( $phase eq 'Save' ) {
541
    # Save the report that has just been built
543
    # Save the report that has just been built
542
    my $area           = $input->param('area');
544
    my $area = $input->param('area');
543
    my $sql  = $input->param('sql');
545
    my $sql  = $input->param('sql');
544
    my $type = $input->param('type');
546
    my $type = $input->param('type');
545
    $template->param(
547
    $template->param(
Lines 643-648 elsif ( $phase eq 'Save Report' ) { Link Here
643
                    cache_expiry   => $cache_expiry,
645
                    cache_expiry   => $cache_expiry,
644
                    public         => $public,
646
                    public         => $public,
645
                } );
647
                } );
648
646
                logaction( "REPORTS", "ADD", $id, "$name | $sql" ) if C4::Context->preference("ReportsLog");
649
                logaction( "REPORTS", "ADD", $id, "$name | $sql" ) if C4::Context->preference("ReportsLog");
647
            $template->param(
650
            $template->param(
648
                'save_successful' => 1,
651
                'save_successful' => 1,
Lines 653-658 elsif ( $phase eq 'Save Report' ) { Link Here
653
    }
656
    }
654
}
657
}
655
658
659
elsif ($phase eq 'Share'){
660
    my $result = Koha::SharedContent::manaShareInfos($input, $borrowernumber, $input->param('reportid'), 'report');
661
    if ( $result and ($result->{code} eq "200" or $result->{code} eq "201") ) {
662
        print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=success");
663
    }else{
664
        print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=fail");
665
    }
666
}
656
elsif ($phase eq 'Run this report'){
667
elsif ($phase eq 'Run this report'){
657
    # execute a saved report
668
    # execute a saved report
658
    my $limit      = $input->param('limit') || 20;
669
    my $limit      = $input->param('limit') || 20;
(-)a/serials/subscription-add.pl (-3 / +6 lines)
Lines 376-382 sub redirect_add_subscription { Link Here
376
    my $mana_id;
376
    my $mana_id;
377
    if ( $query->param('mana_id') ne "" ) {
377
    if ( $query->param('mana_id') ne "" ) {
378
        $mana_id = $query->param('mana_id');
378
        $mana_id = $query->param('mana_id');
379
        Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);
379
        Koha::SharedContent::manaIncrementRequest("subscription",$mana_id, "nbofusers");
380
    }
380
    }
381
    else {
381
    else {
382
        $mana_id = undef;
382
        $mana_id = undef;
Lines 403-409 sub redirect_add_subscription { Link Here
403
        $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
403
        $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
404
        $skip_serialseq, $mana_id
404
        $skip_serialseq, $mana_id
405
    );
405
    );
406
406
    if ( grep { $_ eq "subscription" } split(/,/, C4::Context->preference('AutoShareWithMana')) ){
407
        my $result = Koha::SharedContent::manaShareInfos( $query, $loggedinuser, $subscriptionid, 'subscription');
408
        $template->param( mana_code => $result->{code} );
409
    }
407
    my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
410
    my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
408
    insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );
411
    insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );
409
412
Lines 463-469 sub redirect_mod_subscription { Link Here
463
    my $mana_id;
466
    my $mana_id;
464
    if ( defined( $query->param('mana_id') ) ) {
467
    if ( defined( $query->param('mana_id') ) ) {
465
        $mana_id = $query->param('mana_id');
468
        $mana_id = $query->param('mana_id');
466
        Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);
469
        Koha::SharedContent::manaIncrementRequest("subscription",$mana_id, "nbofusers");
467
    }
470
    }
468
    else {
471
    else {
469
        $mana_id = undef;
472
        $mana_id = undef;
(-)a/serials/subscription-detail.pl (-37 / +2 lines)
Lines 100-143 if ($op eq 'del') { Link Here
100
    }
100
    }
101
}
101
}
102
elsif ( $op and $op eq "share" ) {
102
elsif ( $op and $op eq "share" ) {
103
    my $mana_language;
103
    my $result = Koha::SharedContent::manaShareInfos($query, $loggedinuser, $subscriptionid, 'subscription');
104
    if ( $query->param('mana_language') ) {
105
        $mana_language = $query->param('mana_language');
106
    }
107
    else {
108
        $mana_language = C4::Context->preference('language');
109
    }
110
111
    my $mana_email;
112
    if ( $loggedinuser ne 0 ) {
113
        my $borrower = Koha::Patrons->find($loggedinuser);
114
        $mana_email = $borrower->email
115
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
116
        $mana_email = $borrower->emailpro
117
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
118
        $mana_email =
119
          Koha::Libraries->find( C4::Context->userenv->{'branch'} )->branchemail
120
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
121
    }
122
    $mana_email = C4::Context->preference('KohaAdminEmailAddress')
123
      if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
124
    my %versions = C4::Context::get_versions();
125
126
    my $mana_info = {
127
        language    => $mana_language,
128
        kohaversion => $versions{'kohaVersion'},
129
        exportemail => $mana_email
130
    };
131
    my $sub_mana_info = Koha::Subscription::get_sharable_info($subscriptionid);
132
    $sub_mana_info = { %$sub_mana_info, %$mana_info };
133
    my $result = Koha::SharedContent::manaPostRequest( "subscription",
134
        $sub_mana_info );
135
    if ( $result->{code} eq "200" and $result->{code} eq "201" ) {
136
        my $subscription = Koha::Subscriptions->find($subscriptionid);
137
        $subscription->set( { mana_id => $result->{id} } )->store;
138
        $subs->{mana_id} = $result->{id};
139
    }
140
    $template->param( mana_code => $result->{code} );
104
    $template->param( mana_code => $result->{code} );
105
    $subs->{mana_id} = $result->{id};
141
}
106
}
142
107
143
my $hasRouting = check_routing($subscriptionid);
108
my $hasRouting = check_routing($subscriptionid);
(-)a/svc/mana/addvaluetofield (+42 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2017 BibLibre Baptiste Wojtkowski
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
#
20
21
use Modern::Perl;
22
23
use Koha::SharedContent;
24
use C4::Auth qw(check_cookie_auth);
25
26
use CGI;
27
use JSON;
28
29
30
my $input = new CGI;
31
binmode STDOUT, ":encoding(UTF-8)";
32
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
33
34
my ( $auth_status, $sessionID ) =
35
  check_cookie_auth( $input->cookie('CGISESSID'),
36
    { serials => 'create_subscription' } );
37
38
if ( $auth_status ne "ok" ) {
39
    exit 0;
40
}
41
my $result = Koha::SharedContent::manaIncrementRequest($input->param('resource'), $input->param('id'), $input->param('field'), $input->param('step') );
42
return $result;
(-)a/svc/mana/search (-8 / +23 lines)
Lines 18-25 Link Here
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
#
19
#
20
20
21
use strict;
21
use Modern::Perl;
22
use warnings;
23
22
24
use Koha::SharedContent;
23
use Koha::SharedContent;
25
use Koha::Subscription;
24
use Koha::Subscription;
Lines 39-47 if ( $auth_status ne "ok" ) { Link Here
39
    exit 0;
38
    exit 0;
40
}
39
}
41
40
41
my $templatename;
42
$templatename = "mana/mana-".$input->param( "resource" )."-search-result.tt";
43
42
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
44
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
43
    {
45
    {
44
        template_name   => "serials/mana-subscription-search-result.tt",
46
        template_name   => $templatename,
45
        query           => $input,
47
        query           => $input,
46
        type            => "intranet",
48
        type            => "intranet",
47
        authnotrequired => 0,
49
        authnotrequired => 0,
Lines 52-62 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
52
    }
54
    }
53
);
55
);
54
56
55
my $biblionumber = $input->param('biblionumber');
57
my ($identifier, $sub_mana_info);
58
$identifier = $input->param('id');
59
$template->param( lowWarned => 5, warned => 10, highWarned => 20);
60
my $package = "Koha::".ucfirst($input->param( 'resource' ));
61
$sub_mana_info = $package->get_search_info($identifier);
62
63
$sub_mana_info->{ usecomments } = $input->param('usecomments');
64
my $resourcename = $input->param('resource');
65
my $result = Koha::SharedContent::manaGetRequest( $resourcename, $sub_mana_info);
66
my $nbofcomment;
67
foreach my $resource (@{ $result->{data} }){
68
    $nbofcomment = 0;
69
    foreach my $comment (@{ $resource->{comments} }){
70
        $nbofcomment += $comment->{nb};
71
    }
72
    $resource->{nbofcomment} = $nbofcomment;
73
}
56
74
57
my $sub_mana_info = Koha::Subscription::get_search_info($biblionumber);
75
$template->param( $input->param('resource')."s" => $result->{data} );
58
my $result =
59
  Koha::SharedContent::manaGetRequest( "subscription", $sub_mana_info );
60
$template->param( subscriptions => $result->{data} );
61
76
62
output_with_http_headers $input, $cookie, $template->output, 'json';
77
output_with_http_headers $input, $cookie, $template->output, 'json';
(-)a/svc/mana/share (+47 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2017 BibLibre Baptiste Wojtkowski
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
#
20
21
use Modern::Perl;
22
23
use Koha::SharedContent;
24
use C4::Auth qw(check_cookie_auth);
25
26
use CGI;
27
use JSON;
28
29
30
my $input = new CGI;
31
binmode STDOUT, ":encoding(UTF-8)";
32
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
33
34
my ( $auth_status, $sessionID ) =
35
  check_cookie_auth( $input->cookie('CGISESSID'),
36
    { serials => 'create_subscription' } );
37
38
if ( $auth_status ne "ok" ) {
39
    exit 0;
40
}
41
42
43
my $content;
44
$content->{resource_id} = $input->param("resource_id");
45
$content->{resource_type} = $input->param("resource");
46
$content->{message} = $input->param("message");
47
Koha::SharedContent::manaPostRequest('resource_comment', $content);
(-)a/svc/mana/use (-8 / +12 lines)
Lines 18-28 Link Here
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
#
19
#
20
20
21
use strict;
21
use Modern::Perl;
22
use warnings;
23
22
24
use Koha::SharedContent;
23
use Koha::SharedContent;
25
use C4::Auth qw(check_cookie_auth);
24
use C4::Auth qw(check_cookie_auth);
25
use Koha::Report;
26
26
27
use CGI;
27
use CGI;
28
use JSON;
28
use JSON;
Lines 40-48 if ( $auth_status ne "ok" ) { Link Here
40
    exit 0;
40
    exit 0;
41
}
41
}
42
42
43
my $result = Koha::SharedContent::manaGetRequestWithId("subscription", $input->param('id') );
43
my $result = Koha::SharedContent::manaGetRequestWithId($input->param('resource'), $input->param('id') );
44
my $package = "Koha::".ucfirst($input->param('resource'));
45
my $resource;
44
46
45
my $subscription;
47
if ( $input->param( 'saveinbase' )) {
46
$subscription = $result->{data};
48
    $resource = { id => $package->new_from_mana($result->{data})->id };
47
49
}
48
print(to_json($subscription));
50
else{
51
    $resource = $result->{data};
52
}
53
print(to_json($resource));
49
- 

Return to bug 17047