ed7543287b
Having to write [% KOHA_VERSION %] for each url is bad because: - It's easily forgettable when adding new <script> or <link> - It prevents grep'ing for the full filename - It violates the DRY principle - If at some point we want to change the "force js and css reload" mechanism, it will be tedious This patch: - adds a Template::Toolkit plugin that generates <script> and <link> tags for JS and CSS files, and inserts automatically the Koha version in the filename - use the new plugin to remove all occurences of [% KOHA_VERSION %] - remove the code that was adding KOHA_VERSION as a template variable Test plan: 1. Apply patch 2. Go to several different pages in Koha (opac and intranet) while checking your browser's dev tools (there should be no 404 for JS and CSS files, and the Koha version should appear in filenames) and the server logs (there should be no "File not found") 3. `git grep KOHA_VERSION` should return nothing 4. prove t/db_dependent/Koha/Template/Plugin/Asset.t Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
136 lines
7.5 KiB
Text
136 lines
7.5 KiB
Text
[% USE Asset %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Circulation › Offline circulation file upload</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="ocirc_process_koc" class="circ ocirc">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'circ-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › [% IF ( transactions_loaded ) %] <a href="/cgi-bin/koha/offline_circ/process_koc.pl">Offline circulation file upload</a> › Results[% ELSE %] Offline circulation file upload[% END %]</div>
|
|
|
|
<div class="main container-fluid">
|
|
<div class="row">
|
|
<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
|
|
|
|
[% IF ( transactions_loaded ) %]
|
|
<h2>Koha offline circulation</h2>
|
|
<p>Your data was processed. Here are the results:</p>
|
|
[% FOREACH message IN messages %]
|
|
[% IF ( message.message ) %]
|
|
<div class="dialog alert">
|
|
[% IF ( message.ERROR_file_version ) %]<p>Warning: This file is version [% message.upload_version %], but I only know how to import version [% message.current_version %]. I'll try my best.</p>[% END %]
|
|
</div>
|
|
[% END %]
|
|
[% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode %]). Cannot check in.</p>[% END %]
|
|
[% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
|
|
[% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
|
|
[% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
|
|
[% IF ( message.payment ) %]<p>Accepted payment ([% message.amount %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
|
|
[% END %]
|
|
[% ELSE %]
|
|
<h2>Upload offline circulation data</h2>
|
|
|
|
<div id="fileuploadform">
|
|
<form method="post" action="/cgi-bin/koha/offline_circ/process_koc.pl" enctype="multipart/form-data" class="validated">
|
|
<fieldset class="brief">
|
|
<ol><li><label for="fileToUpload">Choose .koc file: </label>
|
|
<input class="required" required="required" type="file" id="fileToUpload" size="50" name="fileToUpload" />
|
|
<span class="required">Required</span>
|
|
</li></ol>
|
|
<fieldset class="action"><input type="button" class="submit" value="Upload file" id="upload_file" /></fieldset>
|
|
</fieldset>
|
|
</form>
|
|
<div id="fileuploadstatus" class="progress_panel" style="display:none">Upload progress: <progress id="fileuploadprogress" max="100" value="0"></progress> <span class="fileuploadpercent">0</span>%</div>
|
|
<div id="fileuploadfailed" style="display:none"></div>
|
|
</div>
|
|
|
|
<form action="enqueue_koc.pl" id="processfile" method="post" enctype="multipart/form-data">
|
|
<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
|
|
<input type="submit" value="Add to offline circulation queue" id="queueformsubmit" />
|
|
</form>
|
|
|
|
<form action="process_koc.pl" id="enqueuefile" method="post" enctype="multipart/form-data">
|
|
<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
|
|
<input type="hidden" name="runinbackground" id="runinbackground" value="" />
|
|
<input type="hidden" name="completedJobID" id="completedJobID" value="" />
|
|
<!-- <input type="submit" value="Apply directly" id="mainformsubmit" /> -->
|
|
<!-- FIXME: Job freezes when submitted, disabling button as a temporary mitigation -->
|
|
<div id="jobstatus" style="display:none">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
|
|
<div id="jobfailed" style="display:none"></div>
|
|
</form>
|
|
[% END %]
|
|
|
|
|
|
</div>
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/background-job-progressbar.js") %]
|
|
[% Asset.js("js/file-upload.js") %]
|
|
<script type="text/javascript">
|
|
var xhr;
|
|
$(document).ready(function(){
|
|
$("#enqueuefile").hide();
|
|
$("#processfile").hide();
|
|
$("#upload_file").on("click",function(){
|
|
StartUpload();
|
|
});
|
|
$("#queueformsubmit").on("click",function(){
|
|
var processfile = document.getElementById("processfile");
|
|
return CheckForm( processfile );
|
|
});
|
|
$("#mainformsubmit").on("click",function(){
|
|
var enqueuefile = document.getElementById("enqueuefile");
|
|
return CheckForm( enqueuefile );
|
|
});
|
|
});
|
|
|
|
function StartUpload() {
|
|
if( $('#fileToUpload').prop('files').length == 0 ) return;
|
|
$('#fileuploadform input.submit').prop('disabled',true);
|
|
$("#fileuploadfailed").hide();
|
|
$("#processfile").hide();
|
|
$("#fileuploadstatus").show();
|
|
$("form#processfile #uploadedfileid").val('');
|
|
$("form#enqueuefile #uploadedfileid").val('');
|
|
xhr= AjaxUpload( $('#fileToUpload'), $('#fileuploadprogress'), 'temp=1', cbUpload );
|
|
}
|
|
|
|
function cbUpload( status, fileid, errors ) {
|
|
if( status=='done' ) {
|
|
$("form#processfile #uploadedfileid").val( fileid );
|
|
$("form#enqueuefile #uploadedfileid").val( fileid );
|
|
$('#fileToUpload').prop('disabled',true);
|
|
$("#processfile").show();
|
|
$("#enqueuefile").show();
|
|
} else {
|
|
var errMsgs = [ _("Error code 0 not used"), _("File already exists"), _("Directory is not writeable"), _("Root directory for uploads not defined"), _("Temporary directory for uploads not defined") ];
|
|
var errCode = errors[$('#fileToUpload').prop('files')[0].name].code;
|
|
$("#fileuploadstatus").hide();
|
|
$("#fileuploadfailed").show();
|
|
$("#fileuploadfailed").text( _("Upload status: ") +
|
|
( status=='failed'? _("Failed") + " - (" + errCode + ") " + errMsgs[errCode]:
|
|
( status=='denied'? _("Denied"): status ))
|
|
);
|
|
}
|
|
}
|
|
|
|
function CheckForm(f) {
|
|
if (f.uploadedfileid.value == '') {
|
|
alert(_("Please upload a file first."));
|
|
} else {
|
|
$("#fileuploadstatus").hide();
|
|
$("#fileuploadform").slideUp();
|
|
$("#mainformsubmit").prop('disabled',true);
|
|
$("#queueformsubmit").prop('disabled',true);
|
|
return submitBackgroundJob(f);
|
|
}
|
|
return false;
|
|
}
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|