@@ -, +, @@
---
Koha/Report.pm | 41 +++++++++++++++-------
Koha/Reports.pm | 4 +++
Koha/SharedContent.pm | 32 +++++++++++++++++
Koha/Subscription.pm | 11 +++++-
Koha/Subscription/Numberpatterns.pm | 2 +-
.../en/modules/admin/preferences/web_services.pref | 2 +-
serials/serials-collection.pl | 2 +-
t/db_dependent/Serials.t | 2 +-
8 files changed, 78 insertions(+), 18 deletions(-)
--- a/Koha/Report.pm
+++ a/Koha/Report.pm
@@ -37,44 +37,59 @@ Koha::Report - Koha Report Object Class
=cut
-=head3 type
+=head3 get_search_info
=cut
sub get_search_info {
- my $self=shift;
+ my $self = shift;
my $sub_mana_info = { 'query' => shift };
return $sub_mana_info;
}
-sub get_sharable_info{
- my $self=shift;
- my $shared_report_id=shift;
- my $report = Koha::Reports->find($shared_report_id);
- my $sub_mana_info = {
- 'savedsql' => $report->savedsql,
- 'report_name' => $report->report_name,
- 'notes' => $report->notes,
+=head3 get_sharable_info
+
+=cut
+
+sub get_sharable_info {
+ my $self = shift;
+ my $shared_report_id = shift;
+ my $report = Koha::Reports->find($shared_report_id);
+ my $sub_mana_info = {
+ 'savedsql' => $report->savedsql,
+ 'report_name' => $report->report_name,
+ 'notes' => $report->notes,
'report_group' => $report->report_group,
- 'type' => $report->type,
+ 'type' => $report->type,
};
return $sub_mana_info;
}
-sub new_from_mana{
+=head3 new_from_mana
+
+=cut
+
+sub new_from_mana {
my $self = shift;
my $data = shift;
+
+ $data->{mana_id} = $data->{id};
+
delete $data->{exportemail};
delete $data->{kohaversion};
delete $data->{creationdate};
delete $data->{lastimport};
- $data->{mana_id} = $data->{id};
delete $data->{id};
delete $data->{nbofusers};
delete $data->{language};
+
Koha::Report->new($data)->store;
}
+=head3 type
+
+=cut
+
sub _type {
return 'SavedSql';
}
--- a/Koha/Reports.pm
+++ a/Koha/Reports.pm
@@ -45,6 +45,10 @@ sub _type {
return 'SavedSql';
}
+=head3 object_class
+
+=cut
+
sub object_class {
return 'Koha::Report';
}
--- a/Koha/SharedContent.pm
+++ a/Koha/SharedContent.pm
@@ -28,6 +28,18 @@ use C4::Context;
our $MANA_IP = C4::Context->config('mana_config');
+=head1 DESCRIPTION
+
+Package for accessing shared content via Mana
+
+=head2 Package Functions
+
+=cut
+
+=head3 manaRequest
+
+=cut
+
sub manaRequest {
my $mana_request = shift;
my $result;
@@ -53,6 +65,10 @@ sub manaRequest {
return $result ;
}
+=head3 manaIncrementRequest
+
+=cut
+
sub manaIncrementRequest {
my $resource = shift;
my $id = shift;
@@ -71,6 +87,10 @@ sub manaIncrementRequest {
return manaRequest($request);
}
+=head3 manaPostRequest
+
+=cut
+
sub manaPostRequest {
my $resource = shift;
my $content = shift;
@@ -84,6 +104,10 @@ sub manaPostRequest {
return manaRequest($request);
}
+=head3 manaShareInfos
+
+=cut
+
sub manaShareInfos{
my ($query, $loggedinuser, $ressourceid, $ressourcetype) = @_;
my $mana_language;
@@ -132,6 +156,10 @@ sub manaShareInfos{
return $result;
}
+=head3 manaGetRequestWithId
+
+=cut
+
sub manaGetRequestWithId {
my $resource = shift;
my $id = shift;
@@ -142,6 +170,10 @@ sub manaGetRequestWithId {
return manaRequest($request);
}
+=head3 manaGetRequest
+
+=cut
+
sub manaGetRequest {
my $resource = shift;
my $parameters = shift;
--- a/Koha/Subscription.pm
+++ a/Koha/Subscription.pm
@@ -41,7 +41,7 @@ Koha::Subscription - Koha Subscription Object class
=cut
-=head3 type
+=head3 get_search_info
=cut
@@ -62,6 +62,10 @@ sub get_search_info {
return $sub_mana_info;
}
+=head3 get_sharable_info
+
+=cut
+
sub get_sharable_info {
my $self = shift;
my $shared_sub_id = shift;
@@ -108,6 +112,11 @@ sub get_sharable_info {
return $sub_mana_info;
}
+
+=head3 _type
+
+=cut
+
sub _type {
return 'Subscription';
}
--- a/Koha/Subscription/Numberpatterns.pm
+++ a/Koha/Subscription/Numberpatterns.pm
@@ -32,7 +32,7 @@ Koha::SubscriptionNumberpatterns - Koha SubscriptionNumberpattern object set cla
=cut
-=head3 uniqeLabel
+=head3 uniqueLabel
=cut
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
@@ -59,7 +59,7 @@ Web services:
- "Security token used to authenticate on mana:"
- pref: ManaToken
class: Text
- -
You need a security token to authenticate on Mana. If this sytem preference is empty, please fill in the following form, you will receive an email to confirm and activate your token.