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

(-)a/Koha/Report.pm (+54 lines)
Lines 20-25 use Modern::Perl; Link Here
20
use Carp;
20
use Carp;
21
21
22
use Koha::Database;
22
use Koha::Database;
23
use JSON;
24
use Koha::Reports;
23
25
24
use base qw(Koha::Object);
26
use base qw(Koha::Object);
25
27
Lines 33-38 Koha::Report - Koha Report Object class Link Here
33
35
34
=cut
36
=cut
35
37
38
=head3 get_search_info
39
40
Return search info
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
=head3 get_sharable_info
51
52
Return properties that can be shared.
53
54
=cut
55
56
sub get_sharable_info {
57
    my $self=shift;
58
    my $shared_report_id=shift;
59
    my $report = Koha::Reports->find($shared_report_id);
60
    my $sub_mana_info = {
61
        'savedsql' => $report->savedsql,
62
        'report_name' => $report->report_name,
63
        'notes' => $report->notes,
64
        'report_group' => $report->report_group,
65
        'type' => $report->type,
66
    };
67
    return $sub_mana_info;
68
}
69
70
=head3 new_from_mana
71
72
Clear a Mana report to be imported in Koha?
73
74
=cut
75
76
sub new_from_mana{
77
    my $self = shift;
78
    my $data = shift;
79
    delete $data->{exportemail};
80
    delete $data->{kohaversion};
81
    delete $data->{creationdate};
82
    delete $data->{lastimport};
83
    $data->{mana_id} = $data->{id};
84
    delete $data->{id};
85
    delete $data->{nbofusers};
86
    delete $data->{language};
87
    Koha::Report->new($data)->store;
88
}
89
36
=head3 _type
90
=head3 _type
37
91
38
Returns name of corresponding DBIC resultset
92
Returns name of corresponding DBIC resultset
(-)a/Koha/Reports.pm (+6 lines)
Lines 55-58 sub object_class { Link Here
55
    return 'Koha::Report';
55
    return 'Koha::Report';
56
}
56
}
57
57
58
=head1 AUTHOR
59
60
Kyle M Hall <kyle@bywatersolutions.com>
61
62
=cut
63
58
1;
64
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 116-121 sub remove_subscriber { Link Here
116
=cut
116
=cut
117
117
118
sub get_search_info {
118
sub get_search_info {
119
    my $self=shift;
119
    my $searched_sub_id = shift;
120
    my $searched_sub_id = shift;
120
    my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
121
    my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
121
    my $biblioitem =
122
    my $biblioitem =
Lines 131-136 sub get_search_info { Link Here
131
}
132
}
132
133
133
sub get_sharable_info {
134
sub get_sharable_info {
135
    my $self = shift;
134
    my $shared_sub_id = shift;
136
    my $shared_sub_id = shift;
135
    my $subscription  = Koha::Subscriptions->find($shared_sub_id);
137
    my $subscription  = Koha::Subscriptions->find($shared_sub_id);
136
    my $biblio        = Koha::Biblios->find( $subscription->biblionumber );
138
    my $biblio        = Koha::Biblios->find( $subscription->biblionumber );
(-)a/etc/koha-conf.xml (+4 lines)
Lines 155-160 __PAZPAR2_TOGGLE_XML_POST__ Link Here
155
 <!-- Path to the config file for SMS::Send -->
155
 <!-- Path to the config file for SMS::Send -->
156
 <sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>
156
 <sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>
157
157
158
 <!-- URL of the mana KB server -->
159
 <!-- alternative value http://mana-test.koha-community.org to query the test server -->
160
 <mana_config>http://mana-kb.koha-community.org</mana_config>
161
158
 <!-- Configuration for Plack -->
162
 <!-- Configuration for Plack -->
159
 <plack_max_requests>50</plack_max_requests>
163
 <plack_max_requests>50</plack_max_requests>
160
 <plack_workers>2</plack_workers>
164
 <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 61-66 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
61
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
61
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
62
('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
62
('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
63
('AutoEmailPrimaryAddress','OFF','email|emailpro|B_email|cardnumber|OFF','Defines the default email address where \'Account Details\' emails are sent.','Choice'),
63
('AutoEmailPrimaryAddress','OFF','email|emailpro|B_email|cardnumber|OFF','Defines the default email address where \'Account Details\' emails are sent.','Choice'),
64
('AutoShareWithMana','subscription','','defines datas automatically shared with mana','multiple'),
64
('AutoLocation','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff client from unauthorized IP addresses','YesNo'),
65
('AutoLocation','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff client from unauthorized IP addresses','YesNo'),
65
('AutomaticItemReturn','1',NULL,'If ON, Koha will automatically set up a transfer of this item to its homebranch','YesNo'),
66
('AutomaticItemReturn','1',NULL,'If ON, Koha will automatically set up a transfer of this item to its homebranch','YesNo'),
66
('autoMemberNum','0','','If ON, patron number is auto-calculated','YesNo'),
67
('autoMemberNum','0','','If ON, patron number is auto-calculated','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+6 lines)
Lines 303-308 table+table { Link Here
303
.highlighted-row,
303
.highlighted-row,
304
.highlighted-row td { background-color: #FFD000 !important }
304
.highlighted-row td { background-color: #FFD000 !important }
305
305
306
.warned-row,
307
.warned-row td { background-color: #FF9000 !important }
308
309
.high-warned-row,
310
.high-warned-row td { background-color: #FF0000 !important }
311
306
tbody tr:nth-child(odd) td {
312
tbody tr:nth-child(odd) td {
307
	background-color : #F3F3F3;
313
	background-color : #F3F3F3;
308
    border : 1px solid #BCBCBC;
314
    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 7-17 Link Here
7
            [% ELSE %]
7
            [% ELSE %]
8
                <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>
8
                <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>
9
            [% END %]
9
            [% END %]
10
            [% IF Koha.Preference('Mana') %]
10
            [% IF Koha.Preference('Mana') and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %]
11
                [% IF one_language_enabled==0 or mana_id %]
11
                [% IF one_language_enabled==0 or mana_id %]
12
                    <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>
12
                    <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>
13
                [% ELSE %]
13
                [% ELSE %]
14
                    <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>
14
                    <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>
15
                [% END %]
15
                [% END %]
16
            [% END %]
16
            [% END %]
17
        [% END %]
17
        [% END %]
Lines 80-97 Link Here
80
            <div class="modal-body">
80
            <div class="modal-body">
81
                [% IF (mana_id) %]
81
                [% IF (mana_id) %]
82
                    <div class="alert">
82
                    <div class="alert">
83
                        <p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwide it will do nothing.</p>
83
                        <p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>
84
                    </div>
84
                    </div>
85
                [% END %]
85
                [% END %]
86
                [% IF ( languages_loop ) %]
86
                [% IF ( languages_loop ) %]
87
                    [% UNLESS ( one_language_enabled ) %]
87
                    [% UNLESS ( one_language_enabled ) %]
88
                        <div class="rows">
88
                        <div class="rows">
89
                            <p>The frequency and the numberpattern of [% bibliotitle %] are :</p>
89
                                <li><span class="label">Frequency: </span>
90
                            <ol>
91
                                <li><span class="label">Frequency : </span>
92
                                        [% frequency.description %]
90
                                        [% frequency.description %]
93
                                </li>
91
                                </li>
94
                                <li><span class="label">Number pattern : </span>
92
                                <li><span class="label">Number pattern: </span>
95
                                    [% numberpattern.label %]
93
                                    [% numberpattern.label %]
96
                                </li>
94
                                </li>
97
                            </ol>
95
                            </ol>
Lines 99-105 Link Here
99
                        <div class="rows">
97
                        <div class="rows">
100
                            <form method="get" id="mana_share_form" action="/cgi-bin/koha/serials/subscription-detail.pl" class="validated" >
98
                            <form method="get" id="mana_share_form" action="/cgi-bin/koha/serials/subscription-detail.pl" class="validated" >
101
                                <fieldset>
99
                                <fieldset>
102
                                    <label for="mana_language">Language of your sharing :</label>
100
                                    <label for="mana_language">Language:</label>
103
                                    <select id="mana_language" name="mana_language">
101
                                    <select id="mana_language" name="mana_language">
104
                                        [% FOREACH languages_loo IN languages_loop %]
102
                                        [% FOREACH languages_loo IN languages_loop %]
105
                                            [% IF ( languages_loo.group_enabled ) %]
103
                                            [% IF ( languages_loo.group_enabled ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-2 / +6 lines)
Lines 13-23 Link Here
13
<div class="main container-fluid">
13
<div class="main container-fluid">
14
    <div class="row">
14
    <div class="row">
15
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
15
        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
16
16
            [% IF ( Koha.Preference('Mana') == 2) %]
17
                <fieldset>
18
                    <p><center> You haven't decided if you want to activate Mana Knowlede Base, please let us know by clicking<center></p>
19
                    <a href=/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=request+to+mana+webservice><center>Here</center></a>
20
                </fieldset>
21
           [% END %]
17
        <h1>Koha administration</h1>
22
        <h1>Koha administration</h1>
18
        <div class="row">
23
        <div class="row">
19
            <div class="col-md-6 sysprefs">
24
            <div class="col-md-6 sysprefs">
20
21
                <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
25
                <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
22
                <fieldset>
26
                <fieldset>
23
                    <h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>
27
                    <h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref (-3 / +9 lines)
Lines 63-71 Web services: Link Here
63
        -
63
        -
64
            - pref: Mana
64
            - pref: Mana
65
              choices:
65
              choices:
66
                  yes: Enable
66
                  0: Disable
67
                  no: Disable
67
                  1: Enable
68
            - 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.
68
                  2: No, let me think about it
69
            - 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/
70
        -
71
            - 'Fields automatically shared with mana'
72
            - pref: AutoShareWithMana
73
              multiple:
74
                subscription: Subscriptions
69
    Reporting:
75
    Reporting:
70
        -
76
        -
71
            - Only return
77
            - 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 (-6 / +281 lines)
Lines 142-147 canned reports and writing custom SQL reports.</p> Link Here
142
    </div>
142
    </div>
143
[% END %]
143
[% END %]
144
144
145
<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;">
146
    <div class="modal-dialog modal-lg">
147
        <div class="modal-content">
148
            <div class="modal-header">
149
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
150
                <h3 id="mana_search_result_label"> Mana Search</h3>
151
            </div>
152
            <div>
153
                <form id="search_form" style="margin-left: 5%">
154
                    Please enter a few key words:
155
                    <input type=text id=mana_search_field>
156
                    <input type=button class="mana_search_button" value="Search">
157
                </form>
158
                <div class="modal-body">
159
                </div>
160
            </div>
161
        </div>
162
    </div>
163
</div>
164
145
[% IF ( saved1 ) %]
165
[% IF ( saved1 ) %]
146
[% IF ( savedreports ) %]<h1>Saved reports</h1>
166
[% IF ( savedreports ) %]<h1>Saved reports</h1>
147
167
Lines 159-164 canned reports and writing custom SQL reports.</p> Link Here
159
                <option value="">All</option>
179
                <option value="">All</option>
160
            </select>
180
            </select>
161
        </div>
181
        </div>
182
<div style="display:inline-block">
183
    [% IF (manamsg == 'success') %]
184
     <div id="mana_search" class="dialog message">
185
        <p> Shared successfully! Thanks for your help.</p>
186
    </div>
187
    [% ELSIF (manamsg == 'fail') %]
188
     <div id="mana_search" class="dialog message">
189
        <p> An error occured while sharing, please try again later.</p>
190
    </div>
191
    [% END %]
192
193
   [% IF (Koha.Preference('Mana') == 1) %]
194
    <div id="mana_search" class="dialog message">
195
        <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>
196
    </div>
197
    [% END %]
198
199
</script>
200
<h1> [% savedreport.sql %]</h1>
162
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
201
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
163
<input type="hidden" name="phase" value="Delete Multiple" />
202
<input type="hidden" name="phase" value="Delete Multiple" />
164
        <table id="table_reports">
203
        <table id="table_reports">
Lines 186-208 canned reports and writing custom SQL reports.</p> Link Here
186
            <tbody>
225
            <tbody>
187
                [% FOREACH savedreport IN savedreports %]
226
                [% FOREACH savedreport IN savedreports %]
188
                    [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
227
                    [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
189
                        <td>
228
                        <td class="report_checkbox">
190
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
229
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
191
                                <input type="checkbox" name="ids" value="[% savedreport.id %]" />
230
                                <input type="checkbox" name="ids" value="[% savedreport.id %]" />
192
                            [% END %]
231
                            [% END %]
232
                        <input hidden class="report_sql" value="[% savedreport.savedsql %]">
193
                        </td>
233
                        </td>
194
                        <td><label for="ids">[% savedreport.id %]</label></td>
234
                        <td class="report_id"><label for="ids">[% savedreport.id %]</label></td>
195
                        <td>
235
                        <td class="report_name">
196
                            [% IF ( savedreport.report_name ) %]
236
                            [% IF ( savedreport.report_name ) %]
197
                                [% savedreport.report_name %]
237
                                [% savedreport.report_name %]
198
                            [% ELSE %]
238
                            [% ELSE %]
199
                                [ no name ]
239
                                [ no name ]
200
                            [% END %]
240
                            [% END %]
201
                        </td>
241
                        </td>
202
                        <td>[% savedreport.type %]</td>
242
                        <td class="report_type">[% savedreport.type %]</td>
203
                        <td>[% savedreport.groupname %]</td>
243
                        <td class="report_group">[% savedreport.groupname %]</td>
204
                        <td>[% savedreport.subgroupname %]</td>
244
                        <td>[% savedreport.subgroupname %]</td>
205
                        <td>[% savedreport.notes %]</td>
245
                        <td class="report_notes">[% savedreport.notes %]</td>
206
                        <td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
246
                        <td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
207
                        <td><span title="[% savedreport.date_created %]">[% savedreport.date_created | $KohaDates %]</span></td>
247
                        <td><span title="[% savedreport.date_created %]">[% savedreport.date_created | $KohaDates %]</span></td>
208
                        <td><span title="[% savedreport.last_modified %]">[% savedreport.last_modified | $KohaDates with_hours => 1 %]</span></td>
248
                        <td><span title="[% savedreport.last_modified %]">[% savedreport.last_modified | $KohaDates with_hours => 1 %]</span></td>
Lines 251-256 canned reports and writing custom SQL reports.</p> Link Here
251
                                            <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>
291
                                            <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>
252
                                            <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>
292
                                            <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>
253
                                        [% END %]
293
                                        [% END %]
294
                                        [% IF (Koha.Preference('Mana') == 1) %]
295
                                            <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>
296
                                        [% END %]
254
                                        <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
297
                                        <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
255
                                        [% IF ( CAN_user_reports_delete_reports ) %]
298
                                        [% IF ( CAN_user_reports_delete_reports ) %]
256
                                            <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>
299
                                            <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 263-268 canned reports and writing custom SQL reports.</p> Link Here
263
                [% END %]
306
                [% END %]
264
            </tbody>
307
            </tbody>
265
        </table>
308
        </table>
309
</div>
266
        [% IF ( CAN_user_reports_delete_reports ) %]
310
        [% IF ( CAN_user_reports_delete_reports ) %]
267
        <fieldset class="action">
311
        <fieldset class="action">
268
            <input type="submit" value="Delete selected" />
312
            <input type="submit" value="Delete selected" />
Lines 303-308 canned reports and writing custom SQL reports.</p> Link Here
303
[% END %]
347
[% END %]
304
[% END %]
348
[% END %]
305
349
350
<div id="mana_share_report" class="modal fade" tabindex="-1" role="dialog" arialabelledby="mana_share_modal_label" style="display: none;">
351
    <div class="modal-dialog">
352
        <div class="modal-content">
353
            <div class="modal-header">
354
                <h3 id="mana_share_modal_label">Share with Mana</h3>
355
            </div>
356
            <div class="modal-body">
357
                [% IF (mana_id) %]
358
                    <div class="alert">
359
                        <p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>
360
                    </div>
361
                [% END %]
362
                [% IF ( languages_loop ) %]
363
                    [% UNLESS ( one_language_enabled ) %]
364
                        <label id="noteerror" type="hidden">Please enter a report name and descriptive note before sharing (minimum 20 characters)</label>
365
                        <div id="shared_infos" class="rows">
366
                                <li> <span class="label">Id: </span><div id="shared_id"></div>
367
                                </li>
368
                                <li> <span class="label">Name: </span><div id="shared_name"></div>
369
                                </li>
370
                                <li> <span class="label">SQL: </span><div id="shared_sql"></div>
371
                                </li>
372
                                <li> <span class="label">Group: </span><div id="shared_group"></div>
373
                                </li>
374
                                <li> <span class="label">Type: </span><div id="shared_type"></div>
375
                                </li>
376
                                <li> <span class="label">Notes: </span><div id="shared_notes"></div>
377
                                </li>
378
379
                        </div>
380
                        <div class="rows">
381
                            <form method="post" id="mana_share_form" action="/cgi-bin/koha/reports/guided_reports.pl?phase=Share" class="validated" >
382
                                <input type="hidden" name="phase" value="Share">
383
384
                                <fieldset>
385
                                    <label for="mana_language">Language:</label>
386
                                    <select id="mana_language" name="mana_language">
387
                                        [% FOREACH languages_loo IN languages_loop %]
388
                                            [% IF ( languages_loo.group_enabled ) %]
389
                                                [% IF ( languages_loo.plural ) %]
390
                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
391
                                                        [% IF ( sublanguages_loo.enabled ) %]
392
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
393
                                                                <option value="[% languages_loo.rfc4646_subtag %]" selected>
394
                                                                    [% sublanguages_loo.native_description %]
395
                                                                    [% sublanguages_loo.script_description %]
396
                                                                    [% sublanguages_loo.region_description %]
397
398
                                                                    [% sublanguages_loo.variant_description %]
399
                                                                    ([% sublanguages_loo.rfc4646_subtag %])
400
                                                                </option>
401
                                                            [% ELSE %]
402
                                                                <option value="[% languages_loo.rfc4646_subtag %]">
403
                                                                    [% sublanguages_loo.native_description %]
404
                                                                    [% sublanguages_loo.script_description %]
405
                                                                    [% sublanguages_loo.region_description %]
406
                                                                    [% sublanguages_loo.variant_description %]
407
                                                                    ([% sublanguages_loo.rfc4646_subtag %])
408
                                                                </option>
409
                                                            [% END %]
410
                                                        [% END %]
411
                                                    [% END %]
412
                                                [% ELSE %]
413
                                                    [% IF ( languages_loo.group_enabled ) %]
414
                                                        [% IF ( languages_loo.current ) %]
415
                                                            <option value="[% languages_loo.rfc4646_subtag %]" selected>
416
                                                                [% IF ( languages_loo.native_description ) %]
417
                                                                    [% languages_loo.native_description %]
418
                                                                [% ELSE %]
419
                                                                    [% languages_loo.rfc4646_subtag %]
420
                                                                [% END %]
421
                                                            </option>
422
                                                        [% ELSE %]
423
                                                            <option value="[% languages_loo.rfc4646_subtag %]">
424
                                                                [% IF ( languages_loo.native_description ) %]
425
                                                                    [% languages_loo.native_description %]
426
                                                                [% ELSE %]
427
                                                                    [% languages_loo.rfc4646_subtag %]
428
                                                                [% END %]
429
                                                            </option>
430
                                                        [% END %]
431
                                                    [% END %]
432
                                                [% END %]
433
                                            [% END %]
434
                                        [% END %]
435
                                    </select>
436
                                    <input type="hidden" id="reportid" name="reportid" value="[% savedreport.id %]"/>
437
                                </fieldset>
438
                            </form>
439
                        </div>
440
                    [% END %]
441
                [% END %]
442
            </div>
443
            <div class="modal-footer">
444
                <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
445
                [% IF one_language_enabled==0 %]
446
                    <button id="ManaShareButton" type="submit" form="mana_share_form" class="btn btn-primary">Share</button>
447
                [% ELSE %]
448
                    <div id="ManaShareButton" class="btn-group"><a class="btn btn-primary"'onclick="share()">Share</a></div>
449
                [% END %]
450
            </div>
451
        </div>
452
    </div>
453
</div>
454
306
455
307
[% IF ( build1 ) %]
456
[% IF ( build1 ) %]
308
[% IF ( cache_error) %]
457
[% IF ( cache_error) %]
Lines 962-967 $(document).ready(function() { Link Here
962
            }
1111
            }
963
        }
1112
        }
964
1113
1114
        function share() {
1115
            window.location="/cgi-bin/koha/reports/guided_reports.pl?phase=Save";
1116
        }
1117
965
        $(document).ready(function(){
1118
        $(document).ready(function(){
966
1119
967
            $('[data-toggle="tooltip"]').tooltip();
1120
            $('[data-toggle="tooltip"]').tooltip();
Lines 980-985 $(document).ready(function() { Link Here
980
                window.history.back();
1133
                window.history.back();
981
            });
1134
            });
982
1135
1136
            $(".mana_search_button").on("click",function(){
1137
                mana_search($(this).prev().val());
1138
            });
1139
1140
            $(".ShareButton").on("click", function(){
1141
                if($(this).closest("tr").find(".report_notes").text().length < 20 || $(this).closest("tr").find(".report_name").text().length < 20){
1142
                    $("#shared_infos").hide();
1143
                    $("#ManaShareButton").hide();
1144
                    $("#noterror").show();
1145
                }
1146
                else{
1147
                    $("#shared_id").html($(this).closest("tr").find(".report_id").text());
1148
                    $("#shared_name").html($(this).closest("tr").find(".report_name").text());
1149
                    $("#shared_sql").html($(this).closest("tr").find(".report_sql").val());
1150
                    $("#shared_type").html($(this).closest("tr").find(".report_type").text());
1151
                    $("#shared_group").html($(this).closest("tr").find(".report_group").text());
1152
                    $("#shared_notes").html($(this).closest("tr").find(".report_notes").text());
1153
                }
1154
            });
1155
1156
            $('#search_form').submit(function () {
1157
                return false;
1158
            });
1159
983
            $("#addColumn").on("click",function(){
1160
            $("#addColumn").on("click",function(){
984
                addColumn();
1161
                addColumn();
985
            });
1162
            });
Lines 1164-1169 $(document).ready(function() { Link Here
1164
                return confirmDelete(MSG_CONFIRM_DELETE);
1341
                return confirmDelete(MSG_CONFIRM_DELETE);
1165
            });
1342
            });
1166
        });
1343
        });
1344
        function mana_increment(mana_id, resourcename, fieldvalue, stepvalue = 1){
1345
            $.ajax( {
1346
                type: "POST",
1347
                url: "/cgi-bin/koha/svc/mana/addvaluetofield",
1348
                data: {id: mana_id, field: fieldvalue, resource: resourcename, step: stepvalue},
1349
                datatype: "json",
1350
            }).done( function() {
1351
            }).fail( function(){ });
1352
        }
1353
1354
        function mana_use( mana_id ){
1355
            $.ajax( {
1356
                type:"POST",
1357
                url: "/cgi-bin/koha/svc/mana/use",
1358
                data: {id:mana_id, resource: 'report', saveinbase: 1},
1359
                dataType: "json",
1360
            })
1361
            .done( function (result){
1362
                window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&amp;phase=Show%20SQL");
1363
            })
1364
            .fail( function ( foo, msg, longmsg){
1365
            });
1366
        }
1367
1368
        function mana_search( textquery ){
1369
            $.ajax({
1370
                type: "POST",
1371
                url: "/cgi-bin/koha/svc/mana/search",
1372
                data: {biblionumber: $("#biblionumber").val(), resource: 'report', id: textquery, usecomments: 1},
1373
                dataType: "html",
1374
            })
1375
            .done( function( result ) {
1376
                $("#mana_search_result .modal-body").html(result);
1377
                $("#mana_search_result_label").text("Results from Mana Knowledge Base");
1378
                $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
1379
                    "sPaginationType":"four_button",
1380
                    "autoWidth": false,
1381
                    "columnDefs": [
1382
                        { "width": "35%", "targets": 1 }
1383
                    ],
1384
                    "aoColumnDefs": [
1385
                        { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
1386
                        { "sType": "title-string", "aTargets" : [ "title-string" ] },
1387
                        { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
1388
                    ]
1389
                }));
1390
                if($("td.dataTables_empty").length == 0){
1391
                     $("#mana_search").show();
1392
                }
1393
1394
                $( "select[class='actionreport1']" ).show();
1395
                $( "button[class='actionreport2']" ).hide();
1396
                $("#CommentButton").on("click", function(){
1397
                    var resource_type = "report";
1398
                    var target_id = $("#selected_id").val();
1399
                    var manamsg = $("#manamsg").val();
1400
                    mana_comment(target_id, manamsg, resource_type);
1401
                    $("#comment_box").modal("hide");
1402
                });
1403
1404
                $(".showbutton").on("click", function(){
1405
                    $(this).parent().hide();
1406
                    $(this).parent().next().show();
1407
                });
1408
1409
                $("a[class='hidebutton']").on("click", function(){
1410
                    $(this).parent().hide();
1411
                    $(this).parent().prev().show();
1412
                });
1413
1414
                $("#commentCloseButton").on("click", function(){
1415
                    $("#comment_box").modal("hide");
1416
                });
1417
1418
                $(".actionreport1").on("click", function(){
1419
                    $("#selectedcomment").val($(this).val());
1420
                    $(this).parent("select").hide();
1421
                    $(this).parent("select").next().show();
1422
                });
1423
1424
                $(".actionreport2").on("click", function(){
1425
                    $(this).hide();
1426
                    $(this).prev().show();
1427
                    mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
1428
                });
1429
            }).fail( function( result ){
1430
            });
1431
        }
1432
1433
        function mana_comment( target_id, manamsg, resource_type ){
1434
            $.ajax( {
1435
                type: "POST",
1436
                url: "/cgi-bin/koha/svc/mana/share",
1437
                data: {message: manamsg, resource: resource_type , resource_id: target_id},
1438
                datatype: "json",
1439
            })
1440
        }
1441
1167
        function addColumn() {
1442
        function addColumn() {
1168
            $("#availableColumns option:selected").clone().appendTo("#selectedColumns").attr("selected", "selected");
1443
            $("#availableColumns option:selected").clone().appendTo("#selectedColumns").attr("selected", "selected");
1169
        }
1444
        }
(-)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 (-8 / +12 lines)
Lines 9-15 Link Here
9
<style type="text/css">
9
<style type="text/css">
10
fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
10
fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
11
.yui-u li p label.widelabel {
11
.yui-u li p label.widelabel {
12
    width: 300px;  /* not enough for IE7 apparently */
12
width: 300px;  /* not enough for IE7 apparently */
13
}
13
}
14
</style>
14
</style>
15
</head>
15
</head>
Lines 206-213 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here
206
206
207
                <div id="page_2">
207
                <div id="page_2">
208
                    <div class="col-md-6">
208
                    <div class="col-md-6">
209
                [% IF ( Koha.Preference('Mana') == 2) %]
210
                    <fieldset>
211
                        <p><center>You haven't activated the Mana Knowledge Base, click
212
                        <a href=/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=request+to+mana+webservice>here</a>
213
                         to configure.</center></p>
214
                    </fieldset>
215
                [% END %]
216
209
                        <div id="mana_search" class="dialog message">
217
                        <div id="mana_search" class="dialog message">
210
                            <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>
218
                            <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>
211
                        </div>
219
                        </div>
212
                        <div id="subscription_form_planning">
220
                        <div id="subscription_form_planning">
213
                            <fieldset class="rows">
221
                            <fieldset class="rows">
Lines 492-509 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here
492
                </div>
500
                </div>
493
            </form>
501
            </form>
494
        </div>
502
        </div>
495
        <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;">
503
        <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;">
496
            <div class="modal-dialog modal-lg">
504
            <div class="modal-dialog modal-lg">
497
                <div class="modal-content">
505
                <div class="modal-content">
498
                    <div class="modal-header">
506
                    <div class="modal-header">
507
                        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
499
                        <h3 id="mana_search_result_label"></h3>
508
                        <h3 id="mana_search_result_label"></h3>
500
                    </div>
509
                    </div>
501
                    <div class="modal-body">
510
                    <div class="modal-body">
502
                    </div>
503
                    <div class="modal-footer">
504
                        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
505
                    </div>
506
                </div>
507
            </div>
511
            </div>
508
        </div>
512
        </div>
509
513
(-)a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js (-5 / +59 lines)
Lines 396-409 function mana_search() { Link Here
396
    $.ajax({
396
    $.ajax({
397
        type: "POST",
397
        type: "POST",
398
        url: "/cgi-bin/koha/svc/mana/search",
398
        url: "/cgi-bin/koha/svc/mana/search",
399
        data: {biblionumber : $("#biblionumber").val()},
399
        data: {id: $("#biblionumber").val(), resource: 'subscription', usecomments: 1},
400
        dataType: "html",
400
        dataType: "html",
401
    })
401
    })
402
    .done( function( result ) {
402
    .done( function( result ) {
403
    $("#mana_search_result .modal-body").html(result);
403
        $("#mana_search_result .modal-body").html(result);
404
        $("#mana_search_result_label").text("Results from Mana");
404
        $("#mana_search_result_label").text("Results from Mana Knowledge Base");
405
        $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
405
        $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
406
            "sPaginationType": "four_button",
406
            "sPaginationType": "four_button",
407
            "order":[[4, "desc"], [5, "desc"]],
408
            "autoWidth": false,
409
            "columnDefs": [
410
                { "width": "35%", "targets": 1 }
411
            ],
407
            "aoColumnDefs": [
412
            "aoColumnDefs": [
408
                { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
413
                { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
409
                { "sType": "title-string", "aTargets" : [ "title-string" ] },
414
                { "sType": "title-string", "aTargets" : [ "title-string" ] },
Lines 413-429 function mana_search() { Link Here
413
        if($("td.dataTables_empty").length == 0){
418
        if($("td.dataTables_empty").length == 0){
414
            $("#mana_search").show();
419
            $("#mana_search").show();
415
        }
420
        }
421
        $( "select[class='actionreport1']" ).show();
422
        $( "button[class='actionreport2']" ).hide();
423
424
        $("#CommentButton").on("click", function(){
425
            var resource_type = "subscription";
426
            var target_id = $("#selected_id").val();
427
            var manamsg = $("#manamsg").val();
428
            mana_comment(target_id, manamsg, resource_type);
429
            $("#comment_box").modal("hide");
430
        });
431
432
        $("#commentCloseButton").on("click", function(){
433
            $("#comment_box").modal("hide");
434
        });
435
436
        $(".actionreport1").on("click", function(){
437
            $("#selectedcomment").val($(this).val());
438
            $(this).parent("select").hide();
439
            $(this).parent("select").next().show();
440
        });
441
442
        $(".actionreport2").on("click", function(){
443
            $(this).hide();
444
            $(this).prev().show();
445
            mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
446
        });
447
416
    }).fail(function(result){
448
    }).fail(function(result){
417
    });
449
    });
418
}
450
}
419
451
452
function mana_comment( target_id, manamsg, resource_type ){
453
    $.ajax( {
454
        type: "POST",
455
        url: "/cgi-bin/koha/svc/mana/share",
456
        data: {message: manamsg, resource: resource_type , resource_id: target_id},
457
        datatype: "json",
458
    })
459
}
460
461
function mana_increment(mana_id, resource, fieldvalue, stepvalue = 1){
462
    $.ajax( {
463
        type: "POST",
464
        url: "/cgi-bin/koha/svc/mana/addvaluetofield",
465
        data: {id: mana_id, resource: resource, field: fieldvalue, step: stepvalue},
466
        datatype: "json",
467
    })
468
}
469
420
function mana_use(mana_id){
470
function mana_use(mana_id){
421
    $("tr").removeClass("selected");
471
    $("tr").removeClass("selected");
422
    $("#row"+mana_id).addClass("selected");
472
    $("#row"+mana_id).addClass("selected");
423
    $.ajax( {
473
    $.ajax( {
424
        type: "POST",
474
        type: "POST",
425
        url: "/cgi-bin/koha/svc/mana/use",
475
        url: "/cgi-bin/koha/svc/mana/use",
426
        data: {id : mana_id},
476
        data: {id: mana_id, resource: 'subscription'},
427
        dataType: "json",
477
        dataType: "json",
428
    })
478
    })
429
    .done(function(result){
479
    .done(function(result){
Lines 497-502 function removeDisabledAttr() { Link Here
497
}
547
}
498
548
499
$(document).ready(function() {
549
$(document).ready(function() {
550
    mana_search();
551
    $("#myid").on("click", function(){
552
        debugger;
553
    })
500
    $("#displayexample").hide();
554
    $("#displayexample").hide();
501
    $("#mana_search_result").modal("hide");
555
    $("#mana_search_result").modal("hide");
502
    $("#aqbooksellerid").on('keypress', function(e) {
556
    $("#aqbooksellerid").on('keypress', function(e) {
Lines 606-612 $(document).ready(function() { Link Here
606
    });
660
    });
607
    $("#subscription_add_next").on("click",function(){
661
    $("#subscription_add_next").on("click",function(){
608
        if ( Check_page1() ){
662
        if ( Check_page1() ){
609
            [% IF Koha.Preference('Mana') %]
663
            [% IF Koha.Preference('Mana') == 1 %]
610
                mana_search();
664
                mana_search();
611
            [% END %]
665
            [% END %]
612
            show_page_2();
666
            show_page_2();
(-)a/reports/guided_reports.pl (-1 / +12 lines)
Lines 38-43 use Koha::AuthorisedValues; Link Here
38
use Koha::BiblioFrameworks;
38
use Koha::BiblioFrameworks;
39
use Koha::Libraries;
39
use Koha::Libraries;
40
use Koha::Patron::Categories;
40
use Koha::Patron::Categories;
41
use Koha::SharedContent;
41
42
42
=head1 NAME
43
=head1 NAME
43
44
Lines 145-150 elsif ( $phase eq 'Build new' ) { Link Here
145
        }
146
        }
146
    }
147
    }
147
    $template->param(
148
    $template->param(
149
        'manamsg' => $input->param('manamsg') || '',
148
        'saved1'                => 1,
150
        'saved1'                => 1,
149
        'savedreports'          => $reports,
151
        'savedreports'          => $reports,
150
        'usecache'              => $usecache,
152
        'usecache'              => $usecache,
Lines 547-553 elsif ( $phase eq 'Build report' ) { Link Here
547
549
548
elsif ( $phase eq 'Save' ) {
550
elsif ( $phase eq 'Save' ) {
549
    # Save the report that has just been built
551
    # Save the report that has just been built
550
    my $area           = $input->param('area');
552
    my $area = $input->param('area');
551
    my $sql  = $input->param('sql');
553
    my $sql  = $input->param('sql');
552
    my $type = $input->param('type');
554
    my $type = $input->param('type');
553
    $template->param(
555
    $template->param(
Lines 651-656 elsif ( $phase eq 'Save Report' ) { Link Here
651
                    cache_expiry   => $cache_expiry,
653
                    cache_expiry   => $cache_expiry,
652
                    public         => $public,
654
                    public         => $public,
653
                } );
655
                } );
656
654
                logaction( "REPORTS", "ADD", $id, "$name | $sql" ) if C4::Context->preference("ReportsLog");
657
                logaction( "REPORTS", "ADD", $id, "$name | $sql" ) if C4::Context->preference("ReportsLog");
655
            $template->param(
658
            $template->param(
656
                'save_successful' => 1,
659
                'save_successful' => 1,
Lines 668-673 elsif ( $phase eq 'Save Report' ) { Link Here
668
    }
671
    }
669
}
672
}
670
673
674
elsif ($phase eq 'Share'){
675
    my $result = Koha::SharedContent::manaShareInfos($input, $borrowernumber, $input->param('reportid'), 'report');
676
    if ( $result and ($result->{code} eq "200" or $result->{code} eq "201") ) {
677
        print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=success");
678
    }else{
679
        print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=fail");
680
    }
681
}
671
elsif ($phase eq 'Run this report'){
682
elsif ($phase eq 'Run this report'){
672
    # execute a saved report
683
    # execute a saved report
673
    my $limit      = $input->param('limit') || 20;
684
    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, $itemtype, $previousitemtype, $mana_id
404
        $skip_serialseq, $itemtype, $previousitemtype, $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