@@ -, +, @@
- search on reports module is now also validated by pressing enter.
- AutoShare now initialized with nothing autmaticaly shared.
- To create a report you now have to click on New report => New report from Mana.
- Error messages are displayed in case of fail
- Correct the display of sql reports containing "'"
- Importing a report from Mana now opens the edit page
- You don't get message after a successful import from mana (you simply get redirected)
- Fix an error when cretaing subscription
- Fix mana search
- Correct encoding issues
---
Koha/SharedContent.pm | 2 +-
Koha/Subscription.pm | 1 +
.../atomicupdate/mana_03-add_mana_autoshare.sql | 2 +-
.../intranet-tmpl/prog/en/includes/calendar.inc | 2 +-
.../en/includes/mana/mana-report-search-result.inc | 2 +-
.../mana/mana-subscription-search-result.inc | 3 +-
.../prog/en/includes/reports-toolbar.inc | 148 ++++++++++++++++++++-
.../en/modules/reports/guided_reports_start.tt | 122 ++---------------
.../prog/en/modules/serials/serials-search.tt | 2 +-
.../prog/en/modules/serials/subscription-add.tt | 21 ++-
reports/guided_reports.pl | 1 +
serials/serials-search.pl | 3 +
serials/subscription-add.pl | 2 +-
svc/mana/share | 19 +++
14 files changed, 202 insertions(+), 128 deletions(-)
--- a/Koha/SharedContent.pm
+++ a/Koha/SharedContent.pm
@@ -42,7 +42,7 @@ sub manaRequest {
my $response = $userAgent->request($mana_request);
- eval { $result = from_json( $response->decoded_content ); };
+ eval { $result = from_json( $response->decoded_content, { utf8 => 1} ); };
$result->{code} = $response->code;
if ( $@ ){
$result->{msg} = $response->{_msg};
--- a/Koha/Subscription.pm
+++ a/Koha/Subscription.pm
@@ -61,6 +61,7 @@ sub get_search_info {
my $self=shift;
my $searched_sub_id = shift;
my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
+ return unless $biblio;
my $biblioitem =
Koha::Biblioitems->find( { 'biblionumber' => $searched_sub_id } );
--- a/installer/data/mysql/atomicupdate/mana_03-add_mana_autoshare.sql
+++ a/installer/data/mysql/atomicupdate/mana_03-add_mana_autoshare.sql
@@ -1,2 +1,2 @@
INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
-('AutoShareWithMana','subscription','','defines datas automatically shared with mana','multiple');
+('AutoShareWithMana','','','defines datas automatically shared with mana','multiple');
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -118,7 +118,7 @@ jQuery(function($){
dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],
weekHeader: _("Wk"),
dateFormat: "[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSIF ( dateformat == "dmydot" ) %]dd.mm.yy[% ELSE %]yy-mm-dd[% END %]",
- firstDay: [% Koha.Preference('CalendarFirstDayOfWeek') %],
+ firstDay: '[% Koha.Preference('CalendarFirstDayOfWeek') %]',
isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
showMonthAfterYear: false,
yearSuffix: ''};
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc
@@ -30,7 +30,7 @@
[% END %]
[% IF ( report.report_name ) %][% report.report_name %][% END %] |
-
+
[% IF report.notes.length > 200 %]
[% report.notes.substr(0,200) %] Show More
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc
@@ -4,7 +4,6 @@
[% USE Branches %]
-
[% IF statuscode == "200" %]
[% ELSE %]
- [% msg %] statuscode: [% statuscode %]
+ Mana search fails with the code: [% statuscode %]
[% END %]
[% END %]
@@ -64,12 +67,155 @@
[% END %]
+
+[% IF Koha.Preference('Mana')==1 %]
+
+[% END %]
+
+
+
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -88,10 +88,6 @@ $(".goback").on("click",function(e){
window.history.back();
});
-$(".mana_search_button").on("click",function(){
- mana_search($(this).prev().val());
-});
-
$(".ShareButton").on("click", function(){
if($(this).closest("tr").find(".report_notes").text().length < 20 || $(this).closest("tr").find(".report_name").text().length < 20){
$("#shared_infos").hide();
@@ -108,9 +104,6 @@ $(".ShareButton").on("click", function(){
}
});
-$('#search_form').submit(function () {
- return false;
-});
$("#addColumn").on("click",function(){
addColumn();
@@ -294,104 +287,6 @@ $("#delColumn").on("click",function(){
[% END %]
});
-function mana_increment(mana_id, resourcename, fieldvalue, stepvalue = 1){
- $.ajax( {
- type: "POST",
- url: "/cgi-bin/koha/svc/mana/addvaluetofield",
- data: {id: mana_id, field: fieldvalue, resource: resourcename, step: stepvalue},
- datatype: "json",
- }).done( function() {
- }).fail( function(){ });
-}
-
-function mana_use( mana_id ){
- $.ajax( {
- type:"POST",
- url: "/cgi-bin/koha/svc/mana/use",
- data: {id:mana_id, resource: 'report', saveinbase: 1},
- dataType: "json",
- })
- .done( function (result){
- window.location = ("/cgi-bin/koha/reports/guided_reports.pl?reports=").concat(result.id).concat("&phase=Show%20SQL");
- })
- .fail( function ( foo, msg, longmsg){
- });
-}
-
-function mana_search( textquery ){
- $.ajax({
- type: "POST",
- url: "/cgi-bin/koha/svc/mana/search",
- data: {biblionumber: $("#biblionumber").val(), resource: 'report', id: textquery, usecomments: 1},
- dataType: "html",
- })
- .done( function( result ) {
- $("#mana_search_result .modal-body").html(result);
- $("#mana_search_result_label").text("Results from Mana Knowledge Base");
- $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
- "sPaginationType":"four_button",
- "autoWidth": false,
- "columnDefs": [
- { "width": "35%", "targets": 1 }
- ],
- "aoColumnDefs": [
- { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
- { "sType": "title-string", "aTargets" : [ "title-string" ] },
- { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
- ]
- }));
- if($("td.dataTables_empty").length == 0){
- $("#mana_search").show();
- }
-
- $( "select[class='actionreport1']" ).show();
- $( "button[class='actionreport2']" ).hide();
- $("#CommentButton").on("click", function(){
- var resource_type = "report";
- var target_id = $("#selected_id").val();
- var manamsg = $("#manamsg").val();
- mana_comment(target_id, manamsg, resource_type);
- $("#comment_box").modal("hide");
- });
-
- $(".showbutton").on("click", function(){
- $(this).parent().hide();
- $(this).parent().next().show();
- });
-
- $("a[class='hidebutton']").on("click", function(){
- $(this).parent().hide();
- $(this).parent().prev().show();
- });
-
- $("#commentCloseButton").on("click", function(){
- $("#comment_box").modal("hide");
- });
-
- $(".actionreport1").on("click", function(){
- $("#selectedcomment").val($(this).val());
- $(this).parent("select").hide();
- $(this).parent("select").next().show();
- });
-
- $(".actionreport2").on("click", function(){
- $(this).hide();
- $(this).prev().show();
- mana_increment($("#selectedcomment").val(), 'resource_comment', 'nb', -1);
- });
- }).fail( function( result ){
- });
-}
-
-function mana_comment( target_id, manamsg, resource_type ){
- $.ajax( {
- type: "POST",
- url: "/cgi-bin/koha/svc/mana/share",
- data: {message: manamsg, resource: resource_type , resource_id: target_id},
- datatype: "json",
- })
-}
-
@@ -503,6 +398,13 @@ canned reports and writing custom SQL reports.
+[% IF report_converted %]
+
+ The report "[% report_converted %]" has been converted.
+
+[% END %]
+
+
[% IF ( saved1 ) %]
[% IF ( savedreports ) %]Saved reports
@@ -527,14 +429,8 @@ canned reports and writing custom SQL reports.
[% END %]
- [% IF (Koha.Preference('Mana') == 1) %]
-
- You want more reports? Check the Mana Knowledge Base Quick Search
-
- [% END %]
-
- [% savedreport.sql %]
+
| |