6f599652b1
This patch fixes a major issue introduced by the
commit 5c4fdcf Bug 11742: A letter code should be unique.
The interface should let the possibility to create a default template
letter and some specific ones, with the same letter code (letter.code).
The patches submitted on bug 11742 tried to fix an issue based on a
(very bad) assumption: letter.code should be considered as a primary key and
should be uniq.
This patch reintroduces this behavior.
Note that the interface will block a letter code used in different
module (this is consistent not to have the same letter code used for different
needs).
This patch is absolutely not perfect, it just tries to change as less
change as possible and to use new tested subroutines.
Test plan:
1/ Verify that the problem raised on bug 11742 does not appears anymore.
2/ Verify there are no regression on adding, editing, copying, deleting
letters.
3/ Verify you are allowed to create a default letter template with a letter
code and to reuse for a specific letter (i.e. for a given library).
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
476 lines
21 KiB
Text
476 lines
21 KiB
Text
[% USE Koha %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Tools › Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] › Modify notice[% ELSE %] › Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] › Notice added[% END %][% IF ( delete_confirm ) %] › Confirm deletion[% END %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.insertatcaret.js"></script>
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
$(document).ready(function() {
|
|
$("#lettert:has(tbody tr)").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"sDom": 't',
|
|
"aoColumnDefs": [
|
|
{ "aTargets": [ -1,-2, -3 ], "bSortable": false, "bSearchable": false }
|
|
],
|
|
"bPaginate": false
|
|
}));
|
|
[% IF no_op_set %]
|
|
$('#branch').change(function() {
|
|
$('#op').val("");
|
|
$('#selectlibrary').submit();
|
|
});
|
|
$('#newnotice').click(function() {
|
|
$('#op').val("add_form");
|
|
return true;
|
|
});
|
|
[% END %]
|
|
|
|
$("#submit_form").click( function(event) {
|
|
event.preventDefault();
|
|
var at_least_one_exists = 0;
|
|
$("fieldset.mtt").each( function(){
|
|
var title = $(this).find('input[name="title"]').val();
|
|
var content = $(this).find('textarea[name="content"]').val();
|
|
if (
|
|
( title.length == 0 && content.length > 0 )
|
|
|| ( title.length > 0 && content.length == 0 )
|
|
) {
|
|
var mtt = $(this).find('input[name="message_transport_type"]').val();
|
|
var msg = _("Please specify title and content for %s");
|
|
msg = msg.replace( "%s", mtt );
|
|
at_least_one_exists = 1;
|
|
alert(msg)
|
|
return false;
|
|
} else if ( title.length > 0 && content.length > 0 ) {
|
|
at_least_one_exists = 1;
|
|
}
|
|
} );
|
|
if ( ! at_least_one_exists ) {
|
|
alert( _("Please fill at least one template.") );
|
|
return false;
|
|
}
|
|
|
|
// Test if code already exists in DB
|
|
var new_lettercode = $("#code").val();
|
|
var new_branchcode = $("#branch").val();
|
|
[% IF ( add_form and code ) # IF edit %]
|
|
if ( new_lettercode != '[% code %]' ) {
|
|
[% END %]
|
|
$.ajax({
|
|
data: { code: new_lettercode, branchcode: new_branchcode },
|
|
type: 'GET',
|
|
url: '/cgi-bin/koha/svc/letters/',
|
|
success: function (data) {
|
|
if ( data.letters.length > 0 ) {
|
|
if( new_branchcode == '' ) {
|
|
alert( _("A default letter with the code '%s' already exists.").format(new_lettercode) );
|
|
} else {
|
|
alert( _("A letter with the code '%s' already exists for '%s'.").format(new_lettercode, new_branchcode) );
|
|
}
|
|
return false;
|
|
} else {
|
|
$("#add_notice").submit();
|
|
}
|
|
},
|
|
});
|
|
[% IF ( add_form and code ) %]
|
|
} else {
|
|
$("#add_notice").submit();
|
|
}
|
|
[% END %]
|
|
});
|
|
|
|
var sms_limit = 160;
|
|
$("#content_sms").on("keyup", function(){
|
|
var length = $(this).val().length;
|
|
$("#sms_counter").html(length + "/" + sms_limit + _(" characters"));
|
|
if ( length > sms_limit ) {
|
|
$("#sms_counter").css("color", "red");
|
|
} else {
|
|
$("#sms_counter").css("color", "black");
|
|
}
|
|
});
|
|
$( "#transport-types" ).accordion({ collapsible: true, active:false, animate: 200 });
|
|
});
|
|
[% IF add_form or copy_form %]
|
|
|
|
function cancel(f) {
|
|
$('#op').val("");
|
|
f.method = "get";
|
|
f.submit();
|
|
}
|
|
|
|
function isNotNull(f,noalert) {
|
|
if (f.value.length ==0) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
function isNum(v,maybenull) {
|
|
var n = new Number(v.value);
|
|
if (isNaN(n)) {
|
|
return false;
|
|
}
|
|
if (maybenull==0 && v.value=='') {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
function insertValueQuery(mtt_id) {
|
|
var fieldset = $("#" + mtt_id);
|
|
var myQuery = $(fieldset).find('textarea[name="content"]');
|
|
var myListBox = $(fieldset).find('select[name="SQLfieldname"]');
|
|
|
|
if($(myListBox).find('option').length > 0) {
|
|
var chaineAj = "";
|
|
var NbSelect = 0;
|
|
$(myListBox).find('option').each( function (){
|
|
if ( $(this).attr('selected') ) {
|
|
NbSelect++;
|
|
if (NbSelect > 1)
|
|
chaineAj += ", ";
|
|
chaineAj += $(this).val();
|
|
}
|
|
} );
|
|
$(myQuery).insertAtCaret("<<" + chaineAj + ">>");
|
|
}
|
|
}
|
|
[% END %]
|
|
//]]>
|
|
</script>
|
|
</head>
|
|
<body id="tools_letter" class="tools">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'letters-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › [% IF ( add_form or copy_form) %][% IF ( modify ) %]<a href="/cgi-bin/koha/tools/letter.pl">Notices & Slips</a> › Modify notice[% ELSE %] <a href="/cgi-bin/koha/tools/letter.pl">Notices & Slips</a> › Add notice[% END %][% ELSE %][% IF ( add_validate or copy_validate) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices & Slips</a> › Notice added[% ELSE %][% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices & Slips</a> › Confirm deletion[% ELSE %]Notices & Slips[% END %][% END %][% END %]</div>
|
|
|
|
[% IF add_form or copy_form %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% IF ( no_op_set ) %]
|
|
<h1>Notices and Slips</h1>
|
|
<form method="get" action="/cgi-bin/koha/tools/letter.pl" id="selectlibrary">
|
|
<input type="hidden" name="searchfield" value="[% searchfield %]" />
|
|
[% UNLESS independant_branch %]
|
|
<p>
|
|
Select a library :
|
|
<select name="branchcode" id="branch" style="width:20em;">
|
|
<option value="">All libraries</option>
|
|
[% FOREACH branchloo IN branchloop %]
|
|
[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
|
|
[% END %]
|
|
</select>
|
|
</p>
|
|
[% END %]
|
|
<div id="toolbar" class="btn-toolbar">
|
|
<button type="submit" class="btn btn-small" id="newnotice"><i class="icon-plus"></i> New notice</button>
|
|
<input type="hidden" id="op" name="op" />
|
|
</div>
|
|
</form>
|
|
|
|
[% IF ( search ) %]
|
|
<p>You searched for <b>[% searchfield %]</b></p>
|
|
[% END %]
|
|
[% IF ( letter && !independant_branch) %]
|
|
[% select_for_copy = BLOCK %]
|
|
<select name="branchcode">
|
|
[% FOREACH branchloo IN branchloop %]
|
|
<option value="[% branchloo.value %]">Copy to [% branchloo.branchname %]</option>
|
|
[% END %]
|
|
</select>
|
|
[% END %]
|
|
[% END %]
|
|
[% IF letter %]
|
|
<table id="lettert">
|
|
<thead>
|
|
<tr>
|
|
<th>Library</th>
|
|
<th>Module</th>
|
|
<th>Code</th>
|
|
<th>Name</th>
|
|
<th>Copy notice</th>
|
|
<th> </th>
|
|
<th> </th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH lette IN letter %]
|
|
[% can_edit = lette.branchcode || !independant_branch %]
|
|
<tr>
|
|
<td>[% IF lette.branchname %][% lette.branchname %][% ELSE %](All libraries)[% END %]</td>
|
|
<td>[% lette.module %]</td>
|
|
<td>[% lette.code %]</td>
|
|
<td>[% lette.name %]</td>
|
|
<td style="white-space: nowrap">
|
|
[% IF !independant_branch || !lette.branchcode %]
|
|
<form method="post" action="/cgi-bin/koha/tools/letter.pl">
|
|
<input type="hidden" name="op" value="copy_form" />
|
|
<input type="hidden" name="oldbranchcode" value="[% lette.branchcode %]" />
|
|
<input type="hidden" name="module" value="[% lette.module %]" />
|
|
<input type="hidden" name="code" value="[% lette.code %]" />
|
|
[% IF independant_branch %]
|
|
<input type="hidden" name="branchcode" value="[% independant_branch %]" />
|
|
[% ELSE %]
|
|
[% select_for_copy %]
|
|
[% END %]
|
|
<input type="submit" value="Copy" />
|
|
</form>
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% IF can_edit %]
|
|
<a href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]">Edit</a>
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% IF !lette.protected && can_edit %]
|
|
<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[%lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]">Delete</a>
|
|
[% END %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% ELSE %]
|
|
<div class="dialog message">
|
|
[% IF ( branchcode ) %]
|
|
<p>There are no notices for this library.</p>
|
|
[% ELSE %]
|
|
<p>There are no notices.</p>
|
|
[% END %]
|
|
</div>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
|
|
[% IF add_form or copy_form %]
|
|
<h1>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h1>
|
|
<form id="add_notice" name="Aform" method="post" enctype="multipart/form-data" class="validate">
|
|
[% IF add_form %]
|
|
<input type="hidden" name="op" id="op" value="add_validate" />
|
|
[% ELSE %]
|
|
<input type="hidden" name="op" id="op" value="copy_validate" />
|
|
[% END %]
|
|
|
|
<input type="hidden" name="checked" value="0" />
|
|
[% IF ( modify ) %]
|
|
<input type="hidden" name="add" value="0" />
|
|
[% ELSE %]
|
|
<input type="hidden" name="add" value="1" />
|
|
[% END %]
|
|
<fieldset class="rows">
|
|
<input type="hidden" name="oldbranchcode" value="[% oldbranchcode %]" />
|
|
[% IF independant_branch %]
|
|
<input type="hidden" name="branchcode" value="[% independant_branch %]" />
|
|
[% ELSE %]
|
|
<ol>
|
|
<li>
|
|
<label for="branch">Library:</label>
|
|
<select name="branchcode" id="branch" style="width:20em;">
|
|
<option value="">All libraries</option>
|
|
[% FOREACH branchloo IN branchloop %]
|
|
[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
[% END %]
|
|
<li>
|
|
<label for="module">Koha module:</label>
|
|
<input type="hidden" name="oldmodule" value="[% module %]" />
|
|
[% IF adding %]
|
|
<select name="module" id="module" onchange="javascript:window.location.href = unescape(window.location.pathname)+'?op=add_form&module='+this.value+'&content='+window.document.forms['Aform'].elements['content'].value;">
|
|
[% ELSE %]
|
|
<select name="module" id="module">
|
|
[% END %]
|
|
[% IF ( module == "catalogue" ) %]
|
|
<option value="catalogue" selected="selected">Catalog</option>
|
|
[% ELSE %]
|
|
<option value="catalogue" >Catalog</option>
|
|
[% END %]
|
|
[% IF ( module == "circulation" ) %]
|
|
<option value="circulation" selected="selected">Circulation</option>
|
|
[% ELSE %]
|
|
<option value="circulation">Circulation</option>
|
|
[% END %]
|
|
[% IF ( module == "claimacquisition" ) %]
|
|
<option value="claimacquisition" selected="selected">Claim acquisition</option>
|
|
[% ELSE %]
|
|
<option value="claimacquisition">Claim acquisition</option>
|
|
[% END %]
|
|
[% IF ( module == "claimissues" ) %]
|
|
<option value="claimissues" selected="selected">Claim serial issue</option>
|
|
[% ELSE %]
|
|
<option value="claimissues">Claim serial issue</option>
|
|
[% END %]
|
|
[% IF ( module == "reserves" ) %]
|
|
<option value="reserves" selected="selected">Holds</option>
|
|
[% ELSE %]
|
|
<option value="reserves">Holds</option>
|
|
[% END %]
|
|
[% IF ( module == "members" ) %]
|
|
<option value="members" selected="selected">Members</option>
|
|
[% ELSE %]
|
|
<option value="members">Members</option>
|
|
[% END %]
|
|
[% IF ( module == "serial" ) %]
|
|
<option value="serial" selected="selected">Serials (routing list)</option>
|
|
[% ELSE %]
|
|
<option value="serial">Serials (routing list)</option>
|
|
[% END %]
|
|
[% IF ( module == "suggestions" ) %]
|
|
<option value="suggestions" selected="selected">Suggestions</option>
|
|
[% ELSE %]
|
|
<option value="suggestions">Suggestions</option>
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
[% IF adding %]
|
|
<label for="code" class="required">Code:</label>
|
|
<input type="text" id="code" name="code" size="20" maxlength="20" value="" required="required"/>
|
|
<span class="required">Required</span>
|
|
[% ELSE %]
|
|
<label for="code">Code:</label>
|
|
<input type="hidden" id="code" name="code" size="20" maxlength="20" value="[% code %]" required="required"/>
|
|
[% code %]
|
|
[% END %]
|
|
</li>
|
|
<li>
|
|
<label for="name" class="required">Name:</label>
|
|
<input type="text" id="name" name="name" size="60" value="[% letter_name %]" required="required" />
|
|
<span class="required">Required</span>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<div id="transport-types" style="clear:both">
|
|
[% FOREACH letter IN letters %]
|
|
<h3>
|
|
[% SWITCH letter.message_transport_type %]
|
|
[% CASE 'email' %]
|
|
Email
|
|
[% CASE 'print' %]
|
|
Print
|
|
[% CASE 'sms' %]
|
|
SMS
|
|
[% CASE 'feed' %]
|
|
Feed
|
|
[% CASE 'phone' %]
|
|
Phone
|
|
[% CASE %]
|
|
[% letter.message_transport_type %]
|
|
[% END %]
|
|
</h3>
|
|
[% IF letter.message_transport_type == "sms" and not Koha.Preference("SMSSendDriver") %]
|
|
<fieldset class="rows mtt" id="[% letter.message_transport_type %]" disabled="disabled">
|
|
<div class="dialog message">You should enable the SMSSendDriver preference to use the SMS templates.</div>
|
|
[% ELSIF letter.message_transport_type == "phone" and not Koha.Preference("TalkingTechItivaPhoneNotification") %]
|
|
<fieldset class="rows mtt" id="[% letter.message_transport_type %]" disabled="disabled">
|
|
<div class="dialog message">You should enable the TalkingTechItivaPhoneNotification preference to use the phone templates.</div>
|
|
[% ELSE %]
|
|
<fieldset class="rows mtt" id="[% letter.message_transport_type %]">
|
|
[% END %]
|
|
<ol>
|
|
<li>
|
|
<input type="hidden" name="message_transport_type" value="[% letter.message_transport_type %]" />
|
|
<label for="is_html_[% letter.message_transport_type %]">HTML message:</label>
|
|
[% IF letter.is_html %]
|
|
<input type="checkbox" name="is_html_[% letter.message_transport_type %]" id="is_html_[% letter.message_transport_type %]" value="1" checked="checked" />
|
|
[% ELSE %]
|
|
<input type="checkbox" name="is_html_[% letter.message_transport_type %]" id="is_html_[% letter.message_transport_type %]" value="1" />
|
|
[% END %]
|
|
</li>
|
|
<li>
|
|
<label for="title_[% letter.message_transport_type %]">Message subject:</label><input type="text" id="title_[% letter.message_transport_type %]" name="title" size="60" value="[% letter.title %]" />
|
|
</li>
|
|
<li>
|
|
<label for="SQLfieldname_[% letter.message_transport_type %]">Message body:</label>
|
|
[% IF letter.message_transport_type == 'sms' %]
|
|
<span id="sms_counter">[% IF letter.content.length > 0 %][% letter.content.length %][% ELSE %]0[% END %]/160 characters</span>
|
|
[% END %]
|
|
<table>
|
|
<tr>
|
|
<td>
|
|
<select name="SQLfieldname" id="SQLfieldname_[% letter.message_transport_type %]" multiple="multiple" size="9">
|
|
[% FOREACH SQLfieldnam IN SQLfieldname %]
|
|
<option value="[% SQLfieldnam.value %]">[% SQLfieldnam.text %]</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
<td><input type="button" name="insert" value=">>" onclick="insertValueQuery('[% letter.message_transport_type %]')" title="Insert" /></td>
|
|
<td><textarea name="content" id="content_[% letter.message_transport_type %]" cols="80" rows="15">[% letter.content %]</textarea></td>
|
|
</tr>
|
|
</table>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
[% END %]
|
|
</div> <!-- / #transport-types -->
|
|
|
|
[% IF code.search('DGST') %] <span class="overdue">Warning, this is a template for a Digest, as such, any references to branch data ( e.g. branches.branchname ) will refer to the borrower's home branch.</span> [% END %]
|
|
<fieldset class="action"><input type="submit" id="submit_form" value="Submit" class="button" /> <a class="cancel" href="/cgi-bin/koha/tools/letter.pl">Cancel</a></fieldset>
|
|
<input type="hidden" name="searchfield" value="[% searchfield %]" />
|
|
</form>
|
|
[% END %]
|
|
|
|
[% IF ( add_validate or copy_validate) %]
|
|
Data recorded
|
|
<form action="[% action %]" method="post">
|
|
<input type="submit" value="OK" />
|
|
</form>
|
|
[% END %]
|
|
|
|
[% IF ( delete_confirm ) %]
|
|
<div class="dialog alert"><h3>Delete notice?</h3>
|
|
<table>
|
|
<thead>
|
|
<tr>
|
|
<th>Library</th>
|
|
<th>Module</th>
|
|
<th>Code</th>
|
|
<th>Name</th>
|
|
</tr>
|
|
</thead>
|
|
<tr>
|
|
<td>[% branchname %]</td>
|
|
<td>[% module %]</td>
|
|
<td>[% code %]</td>
|
|
<td>[% name %]</td>
|
|
</tr>
|
|
</table>
|
|
<form action="[% action %]" method="post">
|
|
<input type="hidden" name="op" value="delete_confirmed">
|
|
<input type="hidden" name="branchcode" value="[% branchcode %]" />
|
|
<input type="hidden" name="code" value="[% code %]" />
|
|
<input type="hidden" name="module" value="[% module %]" />
|
|
<input type="submit" value="Yes, delete" class="approve" />
|
|
</form>
|
|
|
|
<form action="[% action %]" method="get">
|
|
<input type="submit" value="No, do not delete" class="deny" />
|
|
</form>
|
|
</div>
|
|
|
|
[% END %]
|
|
|
|
[% IF ( delete_confirmed ) %]
|
|
Data deleted
|
|
<form action="[% action %]" method="post">
|
|
<input type="submit" value="OK" />
|
|
</form>
|
|
[% END %]
|
|
|
|
</div>
|
|
</div>
|
|
[% UNLESS add_form or copy_form %]
|
|
<div class="yui-b noprint">
|
|
[% INCLUDE 'tools-menu.inc' %]
|
|
</div>
|
|
[% END %]
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|