Attachment #80191 for bug #17047

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

Lines 178-184 sub buildRequest { Link Here

(-)a/Koha/SharedContent.pm (-1 lines)
178	my $url = "$MANA_IP/$resource.json";	178	my $url = "$MANA_IP/$resource.json";
179	my $request = HTTP::Request->new( POST => $url );	179	my $request = HTTP::Request->new( POST => $url );
180		180
181	$content->{bulk_import} = 0;
182	my $json = to_json( $content, { utf8 => 1 } );	181	my $json = to_json( $content, { utf8 => 1 } );
183	$request->content($json);	182	$request->content($json);
184		183




$DBversion = 'XXX';
if( CheckVersion( $DBversion ) ) {
    if( !column_exists( 'subscription', 'mana_id' ) ) {
        $dbh->do( "ALTER TABLE subscription ADD mana_id int(11) NULL DEFAULT NULL" );
    }

    if( !column_exists( 'saved_sql', 'mana_id' ) ) {
        $dbh->do( "ALTER TABLE saved_sql ADD mana_id int(11) NULL DEFAULT NULL" );
    }

    SetVersion( $DBversion );
    print "Upgrade to $DBversion done (Bug 17047 - Add column mana_id in subscription and saved_sql tables)\n";
}

Lines 1-2 Link Here

(-)a/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql (-2 lines)
1	ALTER TABLE subscription ADD mana_id int(11) NULL DEFAULT NULL;
2	ALTER TABLE saved_sql ADD mana_id int(11) NULL DEFAULT NULL;

Lines 1-2 Link Here

(-)a/installer/data/mysql/atomicupdate/mana_03-add_mana_autoshare.sql (-1 / +1 lines)
1	INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES	1	INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
2	('AutoShareWithMana','','','defines datas automatically shared with mana','multiple');	2	('AutoShareWithMana','','','defines datas automatically shared with mana','multiple');

Lines 1-2 Link Here

(-)a/installer/data/mysql/atomicupdate/mana_04-add_mana_token.sql (-1 / +1 lines)
1	INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES	1	INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
2	('ManaToken','',NULL,'Security token used for authentication on Mana KB service (anti spam)','Textarea');	2	('ManaToken','',NULL,'Security token used for authentication on Mana KB service (anti spam)','Textarea');

Lines 1-4 Link Here

(-)a/installer/data/mysql/atomicupdate/skeleton.perl (-1 / +1 lines)
1	$DBversion = 'XXX'; # will be replaced by the RM	1	$DBversion = 'XXX';
2	if( CheckVersion( $DBversion ) ) {	2	if( CheckVersion( $DBversion ) ) {
3	# you can use $dbh here like:	3	# you can use $dbh here like:
4	# $dbh->do( "ALTER TABLE biblio ADD COLUMN badtaste int" );	4	# $dbh->do( "ALTER TABLE biblio ADD COLUMN badtaste int" );




[% END %]

<script type="text/javascript">
    $(document).ready( function(){
        $(".mana_search_button").on("click",function(){
            mana_search($("#mana_search_field").val());
        });
    });

    function mana_use( mana_id ){
        $.ajax( {
            type:"POST",

Lines 38-44 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (-1 / +1 lines)
38	});	38	});
39	});	39	});
40	//]]>	40	//]]>
41	</script>	41	</script>
42	[% IF subscriptionid and ( CAN_user_serials_edit_subscription \|\| CAN_user_serials_create_subscription \|\| CAN_user_serials_delete_subscription \|\| CAN_user_serials_receive_serials ) %]	42	[% IF subscriptionid and ( CAN_user_serials_edit_subscription \|\| CAN_user_serials_create_subscription \|\| CAN_user_serials_delete_subscription \|\| CAN_user_serials_receive_serials ) %]
43	<div id="toolbar" class="btn-toolbar">	43	<div id="toolbar" class="btn-toolbar">
44	[% IF CAN_user_serials_create_subscription %]	44	[% IF CAN_user_serials_create_subscription %]

Lines 346-355 canned reports and writing custom SQL reports.</p> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-9 / +20 lines)
346	<p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>	346	<p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>
347	</div>	347	</div>
348	[% END %]	348	[% END %]
		349	<div id="note-error" class="alert alert-danger" role="alert">
		350	Please enter a report name and descriptive note before sharing (minimum 20 characters)
		351	</div>
349	[% IF ( languages_loop ) %]	352	[% IF ( languages_loop ) %]
350	[% UNLESS ( one_language_enabled ) %]	353	[% UNLESS ( one_language_enabled ) %]
351	<label id="noteerror" type="hidden">Please enter a report name and descriptive note before sharing (minimum 20 characters)</label>	354	<div class="shared_infos rows">
352	<div id="shared_infos" class="rows">
353	<li> <span class="label">Id: </span><div id="shared_id"></div>	355	<li> <span class="label">Id: </span><div id="shared_id"></div>
354	</li>	356	</li>
355	<li> <span class="label">Name: </span><div id="shared_name"></div>	357	<li> <span class="label">Name: </span><div id="shared_name"></div>
Lines 368-374 canned reports and writing custom SQL reports.</p> Link Here
368	<form method="post" id="mana_share_form" action="/cgi-bin/koha/reports/guided_reports.pl?phase=Share" class="validated" >	370	<form method="post" id="mana_share_form" action="/cgi-bin/koha/reports/guided_reports.pl?phase=Share" class="validated" >
369	<input type="hidden" name="phase" value="Share">	371	<input type="hidden" name="phase" value="Share">
370		372
371	<fieldset>	373	<fieldset class="shared_infos">
372	<label for="mana_language">Language:</label>	374	<label for="mana_language">Language:</label>
373	<select id="mana_language" name="mana_language">	375	<select id="mana_language" name="mana_language">
374	[% FOREACH languages_loo IN languages_loop %]	376	[% FOREACH languages_loo IN languages_loop %]
Lines 428-438 canned reports and writing custom SQL reports.</p> Link Here
428	[% END %]	430	[% END %]
429	</div>	431	</div>
430	<div class="modal-footer">	432	<div class="modal-footer">
431	<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>	433	<button class="btn" id="ManaCloseButton" data-dismiss="modal" aria-hidden="true">Close</button>
432	[% IF one_language_enabled==0 %]	434	[% IF one_language_enabled==0 %]
433	<button id="ManaShareButton" type="submit" form="mana_share_form" class="btn btn-primary">Share</button>	435	<button id="ManaShareButton" type="submit" form="mana_share_form" class="btn btn-primary shared_infos">Share</button>
434	[% ELSE %]	436	[% ELSE %]
435	<div id="ManaShareButton" class="btn-group"><a class="btn btn-primary">Share</a></div>	437	<div id="ManaShareButton" class="btn-group"><a class="btn btn-primary shared_infos">Share</a></div>
436	[% END %]	438	[% END %]
437	</div>	439	</div>
438	</div>	440	</div>
Lines 1065-1070 $(document).ready(function() { Link Here
1065	[% Asset.js("../lib/d3c3/d3.min.js") \| $raw %]	1067	[% Asset.js("../lib/d3c3/d3.min.js") \| $raw %]
1066	[% Asset.js("../lib/d3c3/c3.min.js") \| $raw %]	1068	[% Asset.js("../lib/d3c3/c3.min.js") \| $raw %]
1067	[% INCLUDE 'calendar.inc' %]	1069	[% INCLUDE 'calendar.inc' %]
		1070	[% INCLUDE 'mana.inc' %]
1068	[% IF ( saved1 ) %]	1071	[% IF ( saved1 ) %]
1069	[% INCLUDE 'datatables.inc' %]	1072	[% INCLUDE 'datatables.inc' %]
1070	[% INCLUDE 'columns_settings.inc' %]	1073	[% INCLUDE 'columns_settings.inc' %]
Lines 1250-1260 $(document).ready(function() { Link Here
1250	window.history.back();	1253	window.history.back();
1251	});	1254	});
1252		1255
		1256	$(".mana_search_button").on("click",function(){
		1257	mana_search($("#mana_search_field").val());
		1258	});
		1259
1253	$(".ShareButton").on("click", function(){	1260	$(".ShareButton").on("click", function(){
		1261	$("#note-error").hide();
1254	if($(this).closest("tr").find(".report_notes").text().length < 20 \|\| $(this).closest("tr").find(".report_name").text().length < 20){	1262	if($(this).closest("tr").find(".report_notes").text().length < 20 \|\| $(this).closest("tr").find(".report_name").text().length < 20){
1255	$("#shared_infos").hide();	1263	$(".shared_infos").hide();
1256	$("#ManaShareButton").hide();	1264	$("#note-error").show();
1257	$("#noterror").show();
1258	}	1265	}
1259	else{	1266	else{
1260	$("#shared_id").html($(this).closest("tr").find(".report_id").text());	1267	$("#shared_id").html($(this).closest("tr").find(".report_id").text());
Lines 1266-1271 $(document).ready(function() { Link Here
1266	}	1273	}
1267	});	1274	});
1268		1275
		1276	$("#ManaCloseButton").on("click", function() {
		1277	$(".shared_infos").show();
		1278	});
		1279
1269	$("#addColumn").on("click",function(){	1280	$("#addColumn").on("click",function(){
1270	addColumn();	1281	addColumn();
1271	});	1282	});

Lines 416-421 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (+1 lines)
416	[% MACRO jsinclude BLOCK %]	416	[% MACRO jsinclude BLOCK %]
417	[% INCLUDE 'calendar.inc' %]	417	[% INCLUDE 'calendar.inc' %]
418	[% INCLUDE 'datatables.inc' %]	418	[% INCLUDE 'datatables.inc' %]
		419	[% INCLUDE 'mana.inc' %]
419	<script type="text/javascript">	420	<script type="text/javascript">
420	var subscriptionid = "[% subscriptionid \| html %]";	421	var subscriptionid = "[% subscriptionid \| html %]";
421	var MSG_CLOSE_SUBSCRIPTION = _("Are you sure you want to close this subscription?");	422	var MSG_CLOSE_SUBSCRIPTION = _("Are you sure you want to close this subscription?");

Lines 513-518 width: 300px; /* not enough for IE7 apparently */ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (+2 lines)
513		513
514	[% MACRO jsinclude BLOCK %]	514	[% MACRO jsinclude BLOCK %]
515	[% INCLUDE 'calendar.inc' %]	515	[% INCLUDE 'calendar.inc' %]
		516	[% INCLUDE 'datatables.inc' %]
516	<script type="text/javascript">	517	<script type="text/javascript">
517	var subscriptionid = "[% subscriptionid \| html %]";	518	var subscriptionid = "[% subscriptionid \| html %]";
518	var irregularity = "[% irregularity \| html %]";	519	var irregularity = "[% irregularity \| html %]";
Lines 521-526 width: 300px; /* not enough for IE7 apparently */ Link Here
521	[% FOREACH field IN dont_export_field_loop %]	522	[% FOREACH field IN dont_export_field_loop %]
522	tags.push("[% field.fieldid \| html %]");	523	tags.push("[% field.fieldid \| html %]");
523	[% END %]	524	[% END %]
		525	var mana_enabled = [% Koha.Preference('Mana') %]
524	var MSG_LINK_TO_VENDOR = _("If you wish to claim late or missing issues you must link this subscription to a vendor. Click OK to ignore or Cancel to return and enter a vendor");	526	var MSG_LINK_TO_VENDOR = _("If you wish to claim late or missing issues you must link this subscription to a vendor. Click OK to ignore or Cancel to return and enter a vendor");
525	var MSG_LINK_BIBLIO = _("You must choose or create a bibliographic record");	527	var MSG_LINK_BIBLIO = _("You must choose or create a bibliographic record");
526	var MSG_REQUIRED_SUB_LENGTH = _("You must choose a subscription length or an end date.");	528	var MSG_REQUIRED_SUB_LENGTH = _("You must choose a subscription length or an end date.");

Lines 40-43 function popup(subscriptionid) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js (+3 lines)
40	popup( subscriptionid );	40	popup( subscriptionid );
41	return false;	41	return false;
42	});	42	});
		43	$("#mana-subscription-share").click(function() {
		44	window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=share";
		45	});
43	});	46	});

Lines 617-625 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js (-2 / +2 lines)
617	});	617	});
618	$("#subscription_add_next").on("click",function(){	618	$("#subscription_add_next").on("click",function(){
619	if ( Check_page1() ){	619	if ( Check_page1() ){
620	[% IF Koha.Preference('Mana') == 1 %]	620	if ( mana_enabled ) {
621	mana_search();	621	mana_search();
622	[% END %]	622	}
623	show_page_2();	623	show_page_2();
624	}	624	}
625	});	625	});

Lines 302-308 sub redirect_add_subscription { Link Here

(-)a/serials/subscription-add.pl (-3 / +2 lines)
302	)->store();	302	)->store();
303	$periodicity = $subscription_freq->id;	303	$periodicity = $subscription_freq->id;
304	}	304	}
305	my $numberpattern = Koha::Subscription::Numberpatterns->new_or_existing($query->Vars);	305	my $numberpattern = Koha::Subscription::Numberpatterns->new_or_existing({ $query->Vars });
306		306
307	my $auser = $query->param('user');	307	my $auser = $query->param('user');
308	my $branchcode = $query->param('branchcode');	308	my $branchcode = $query->param('branchcode');
Lines 409-415 sub redirect_mod_subscription { Link Here
409	)->store();	409	)->store();
410	$periodicity = $subscription_freq->id;	410	$periodicity = $subscription_freq->id;
411	}	411	}
412	my $numberpattern = Koha::Subscription::Numberpatterns->new_or_existing($query->Vars);	412	my $numberpattern = Koha::Subscription::Numberpatterns->new_or_existing({ $query->Vars });
413		413
414	my $subtype = $query->param('subtype');	414	my $subtype = $query->param('subtype');
415	my $sublength = $query->param('sublength');	415	my $sublength = $query->param('sublength');
416	-

Return to bug 17047

Lines 139-150 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc (-6 lines)
139	[% END %]	139	[% END %]
140		140
141	<script type="text/javascript">	141	<script type="text/javascript">
142	$(document).ready( function(){
143	$(".mana_search_button").on("click",function(){
144	mana_search($("#mana_search_field").val());
145	});
146	});
147
148	function mana_use( mana_id ){	142	function mana_use( mana_id ){
149	$.ajax( {	143	$.ajax( {
150	type:"POST",	144	type:"POST",