Bug 34655: (QA follow-up) Tidy the file
As we're already updating whitespace over almost the entire file, we may as well go and tidy the whole thing too and add the /* keep tidy */ flag. (I checked for conflicts with existing bugs.. there's bug 20930 which will need a rebase, but it will already conflict and need a rebase and is currently FQA) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Martin Renvoize
Katrin Fischer
parent
d5e20a8321
commit
fffe081bec
|
|
@ -1,14 +1,29 @@
|
|||
/* keep tidy */
|
||||
/* global KOHA CodeMirror to_highlight search_jumped humanMsg dataTablesDefaults themelang */
|
||||
// We can assume 'KOHA' exists, as we depend on KOHA.AJAX
|
||||
|
||||
KOHA.Preferences = {
|
||||
Save: function ( form ) {
|
||||
if ( ! $(form).valid() ) {
|
||||
humanMsg.displayAlert( __("Error: presence of invalid data prevent saving. Please make the corrections and try again.") );
|
||||
Save: function (form) {
|
||||
if (!$(form).valid()) {
|
||||
humanMsg.displayAlert(
|
||||
__(
|
||||
"Error: presence of invalid data prevent saving. Please make the corrections and try again."
|
||||
)
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
let sysprefs = $(form).find('.modified').not('.preference-checkbox').toArray().reduce((map, e) => ({ ...map, [$(e).attr('name')]: [$(e).val()].flat()}), {});
|
||||
let sysprefs = $(form)
|
||||
.find(".modified")
|
||||
.not(".preference-checkbox")
|
||||
.toArray()
|
||||
.reduce(
|
||||
(map, e) => ({
|
||||
...map,
|
||||
[$(e).attr("name")]: [$(e).val()].flat(),
|
||||
}),
|
||||
{}
|
||||
);
|
||||
|
||||
// checkbox prefs
|
||||
let modified_boxes = $(form).find(".modified.preference-checkbox");
|
||||
|
|
@ -29,51 +44,63 @@ KOHA.Preferences = {
|
|||
}
|
||||
}
|
||||
|
||||
if ( !Object.keys(sysprefs).length ) {
|
||||
humanMsg.displayAlert( __("Nothing to save") );
|
||||
if (!Object.keys(sysprefs).length) {
|
||||
humanMsg.displayAlert(__("Nothing to save"));
|
||||
return;
|
||||
}
|
||||
KOHA.AJAX.MarkRunning($(form).find('.save-all'), __("Saving...") );
|
||||
KOHA.AJAX.MarkRunning($(form).find(".save-all"), __("Saving..."));
|
||||
const client = APIClient.syspref;
|
||||
client.sysprefs.update_all(sysprefs).then(
|
||||
success => {
|
||||
KOHA.Preferences.Success( form );
|
||||
},
|
||||
error => {
|
||||
console.warn("Something wrong happened: %s".format(error));
|
||||
}
|
||||
).then(() => {
|
||||
KOHA.AJAX.MarkDone( $( form ).find( '.save-all' ) );
|
||||
});
|
||||
|
||||
client.sysprefs
|
||||
.update_all(sysprefs)
|
||||
.then(
|
||||
success => {
|
||||
KOHA.Preferences.Success(form);
|
||||
},
|
||||
error => {
|
||||
console.warn("Something wrong happened: %s".format(error));
|
||||
}
|
||||
)
|
||||
.then(() => {
|
||||
KOHA.AJAX.MarkDone($(form).find(".save-all"));
|
||||
});
|
||||
},
|
||||
Success: function ( form ) {
|
||||
Success: function (form) {
|
||||
var msg = "";
|
||||
$(form).find('.modified').each(function(){
|
||||
var modified_pref = $(this).attr("id");
|
||||
modified_pref = modified_pref.replace("pref_","");
|
||||
msg += "<strong>" + __("Saved preference %s").format(modified_pref) + "</strong>\n";
|
||||
});
|
||||
$(form)
|
||||
.find(".modified")
|
||||
.each(function () {
|
||||
var modified_pref = $(this).attr("id");
|
||||
modified_pref = modified_pref.replace("pref_", "");
|
||||
msg +=
|
||||
"<strong>" +
|
||||
__("Saved preference %s").format(modified_pref) +
|
||||
"</strong>\n";
|
||||
});
|
||||
humanMsg.displayAlert(msg);
|
||||
|
||||
$( form )
|
||||
.find( '.modified-warning' ).remove().end()
|
||||
.find( '.modified' ).removeClass('modified');
|
||||
$(form)
|
||||
.find(".modified-warning")
|
||||
.remove()
|
||||
.end()
|
||||
.find(".modified")
|
||||
.removeClass("modified");
|
||||
KOHA.Preferences.Modified = false;
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
function mark_modified() {
|
||||
$( this.form ).find( '.save-all' ).prop('disabled', false);
|
||||
$( this ).addClass( 'modified' );
|
||||
var name_cell = $( this ).parents( '.name-row' ).find( '.name-cell' );
|
||||
if ( !name_cell.find( '.modified-warning' ).length )
|
||||
name_cell.append('<em class="modified-warning">(' + __("modified") + ')</em>');
|
||||
$(this.form).find(".save-all").prop("disabled", false);
|
||||
$(this).addClass("modified");
|
||||
var name_cell = $(this).parents(".name-row").find(".name-cell");
|
||||
if (!name_cell.find(".modified-warning").length)
|
||||
name_cell.append(
|
||||
'<em class="modified-warning">(' + __("modified") + ")</em>"
|
||||
);
|
||||
KOHA.Preferences.Modified = true;
|
||||
}
|
||||
|
||||
window.onbeforeunload = function () {
|
||||
if ( KOHA.Preferences.Modified ) {
|
||||
if (KOHA.Preferences.Modified) {
|
||||
return __("You have made changes to system preferences.");
|
||||
}
|
||||
};
|
||||
|
|
@ -81,12 +108,14 @@ window.onbeforeunload = function () {
|
|||
// Add event handlers to any elements with .expand-textarea classes
|
||||
// this allows the CodeMirror widget to be displayed
|
||||
function addExpandHandler() {
|
||||
const textAreas = $('.expand-textarea').map(function() {
|
||||
return this
|
||||
}).get();
|
||||
textAreas.forEach((expandTextArea) => {
|
||||
const textAreas = $(".expand-textarea")
|
||||
.map(function () {
|
||||
return this;
|
||||
})
|
||||
.get();
|
||||
textAreas.forEach(expandTextArea => {
|
||||
// Don't duplicate click event handlers
|
||||
const ev = $._data($(expandTextArea).get(0), 'events');
|
||||
const ev = $._data($(expandTextArea).get(0), "events");
|
||||
if (ev && ev.click) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -96,17 +125,20 @@ function addExpandHandler() {
|
|||
$(this).hide();
|
||||
var target = $(this).data("target");
|
||||
var syntax = $(this).data("syntax");
|
||||
var lint_type = syntax === 'javascript'? { 'esversion': 6 } : true;
|
||||
var lint_type = syntax === "javascript" ? { esversion: 6 } : true;
|
||||
$("#collapse_" + target).show();
|
||||
if (syntax) {
|
||||
var editor = CodeMirror.fromTextArea(document.getElementById("pref_" + target), {
|
||||
lineNumbers: true,
|
||||
mode: syntax,
|
||||
lineWrapping: true,
|
||||
viewportMargin: Infinity,
|
||||
gutters: ["CodeMirror-lint-markers"],
|
||||
lint: lint_type,
|
||||
});
|
||||
var editor = CodeMirror.fromTextArea(
|
||||
document.getElementById("pref_" + target),
|
||||
{
|
||||
lineNumbers: true,
|
||||
mode: syntax,
|
||||
lineWrapping: true,
|
||||
viewportMargin: Infinity,
|
||||
gutters: ["CodeMirror-lint-markers"],
|
||||
lint: lint_type,
|
||||
}
|
||||
);
|
||||
editor.on("change", function () {
|
||||
mark_modified.call($("#pref_" + target)[0]);
|
||||
});
|
||||
|
|
@ -117,18 +149,20 @@ function addExpandHandler() {
|
|||
$("#pref_" + target).show();
|
||||
}
|
||||
});
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
// Add event handlers to any elements with .collapse-textarea classes
|
||||
// this allows the hiding of the CodeMirror widget
|
||||
function addCollapseHandler() {
|
||||
const textAreas = $('.collapse-textarea').map(function() {
|
||||
return this
|
||||
}).get();
|
||||
textAreas.forEach((collapseTextArea) => {
|
||||
const textAreas = $(".collapse-textarea")
|
||||
.map(function () {
|
||||
return this;
|
||||
})
|
||||
.get();
|
||||
textAreas.forEach(collapseTextArea => {
|
||||
// Don't duplicate click event handlers
|
||||
const ev = $._data($(collapseTextArea).get(0), 'events');
|
||||
const ev = $._data($(collapseTextArea).get(0), "events");
|
||||
if (ev && ev.click) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -139,80 +173,93 @@ function addCollapseHandler() {
|
|||
var syntax = $(this).data("syntax");
|
||||
$("#expand_" + target).show();
|
||||
if (syntax) {
|
||||
var editor = $("#pref_" + target).next(".CodeMirror")[0].CodeMirror;
|
||||
var editor = $("#pref_" + target).next(".CodeMirror")[0]
|
||||
.CodeMirror;
|
||||
editor.toTextArea();
|
||||
}
|
||||
$("#pref_" + target).hide();
|
||||
});
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
// Add a handler for any consent delete links
|
||||
function addConsentDeleteHandler() {
|
||||
const deleteButtons = $('.consentDelete').map(function() {
|
||||
return this
|
||||
}).get();
|
||||
deleteButtons.forEach((deleteButton) => {
|
||||
const deleteButtons = $(".consentDelete")
|
||||
.map(function () {
|
||||
return this;
|
||||
})
|
||||
.get();
|
||||
deleteButtons.forEach(deleteButton => {
|
||||
// Don't duplicate click event handlers
|
||||
const ev = $._data($(deleteButton).get(0), 'events');
|
||||
const ev = $._data($(deleteButton).get(0), "events");
|
||||
if (ev && ev.click) {
|
||||
return;
|
||||
}
|
||||
$(deleteButton).on('click', function (e) {
|
||||
$(deleteButton).on("click", function (e) {
|
||||
e.preventDefault();
|
||||
const target = $(this).data('target');
|
||||
const proceed = confirm(__('Are you sure you want to delete this consent item?'));
|
||||
const target = $(this).data("target");
|
||||
const proceed = confirm(
|
||||
__("Are you sure you want to delete this consent item?")
|
||||
);
|
||||
if (proceed) {
|
||||
$('#' + target).remove();
|
||||
$("#" + target).remove();
|
||||
}
|
||||
});
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
$("table.preferences").dataTable($.extend(true, {}, dataTablesDefaults, {
|
||||
"dom": 't',
|
||||
"columnDefs": [
|
||||
{ "targets": [ -1 ], "orderable": false, "searchable": false }
|
||||
],
|
||||
"paging": false
|
||||
}));
|
||||
$("table.preferences").dataTable(
|
||||
$.extend(true, {}, dataTablesDefaults, {
|
||||
dom: "t",
|
||||
columnDefs: [{ targets: [-1], orderable: false, searchable: false }],
|
||||
paging: false,
|
||||
})
|
||||
);
|
||||
|
||||
$( '.prefs-tab' )
|
||||
.find( 'input.preference, textarea.preference' ).on('input', function () {
|
||||
if ( this.defaultValue === undefined || this.value != this.defaultValue ) mark_modified.call( this );
|
||||
} ).end()
|
||||
.find( 'select.preference' ).change( mark_modified );
|
||||
$('.preference-checkbox').change( function () {
|
||||
$('.preference-checkbox').addClass('modified');
|
||||
$(".prefs-tab")
|
||||
.find("input.preference, textarea.preference")
|
||||
.on("input", function () {
|
||||
if (this.defaultValue === undefined || this.value != this.defaultValue)
|
||||
mark_modified.call(this);
|
||||
})
|
||||
.end()
|
||||
.find("select.preference")
|
||||
.change(mark_modified);
|
||||
$(".preference-checkbox").change(function () {
|
||||
$(".preference-checkbox").addClass("modified");
|
||||
mark_modified.call(this);
|
||||
} );
|
||||
});
|
||||
|
||||
$(".set_syspref").click(function() {
|
||||
var s = $(this).attr('data-syspref');
|
||||
var v = $(this).attr('data-value');
|
||||
$(".set_syspref").click(function () {
|
||||
var s = $(this).attr("data-syspref");
|
||||
var v = $(this).attr("data-value");
|
||||
// populate the input with the value in data-value
|
||||
$("#pref_"+s).val(v);
|
||||
$("#pref_" + s).val(v);
|
||||
// pass the DOM element to trigger "modified" to enable submit button
|
||||
mark_modified.call($("#pref_"+s)[0]);
|
||||
mark_modified.call($("#pref_" + s)[0]);
|
||||
return false;
|
||||
});
|
||||
|
||||
$(".sortable").each( (i, e) => {
|
||||
$(".sortable").each((i, e) => {
|
||||
Sortable.create(e, {
|
||||
animation: 150,
|
||||
onUpdate: function( e ){
|
||||
$(e.target).find('input:first').change();
|
||||
}
|
||||
onUpdate: function (e) {
|
||||
$(e.target).find("input:first").change();
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
$( '.prefs-tab .action .cancel' ).click( function () { KOHA.Preferences.Modified = false } );
|
||||
|
||||
$( '.prefs-tab .save-all' ).prop('disabled', true).click( function () {
|
||||
KOHA.Preferences.Save( this.form );
|
||||
return false;
|
||||
$(".prefs-tab .action .cancel").click(function () {
|
||||
KOHA.Preferences.Modified = false;
|
||||
});
|
||||
|
||||
$(".prefs-tab .save-all")
|
||||
.prop("disabled", true)
|
||||
.click(function () {
|
||||
KOHA.Preferences.Save(this.form);
|
||||
return false;
|
||||
});
|
||||
|
||||
addExpandHandler();
|
||||
|
||||
addCollapseHandler();
|
||||
|
|
@ -220,86 +267,110 @@ addCollapseHandler();
|
|||
$("h3").attr("class", "expanded").attr("title", __("Collapse this section"));
|
||||
var collapsible = $(".collapsed,.expanded");
|
||||
|
||||
$(collapsible).on("click",function(){
|
||||
$(collapsible).on("click", function () {
|
||||
var h3Id = $(this).attr("id");
|
||||
var panel = $("#collapse_" + h3Id);
|
||||
if(panel.is(":visible")){
|
||||
$(this).addClass("collapsed").removeClass("expanded").attr("title", __("Expand this section") );
|
||||
if (panel.is(":visible")) {
|
||||
$(this)
|
||||
.addClass("collapsed")
|
||||
.removeClass("expanded")
|
||||
.attr("title", __("Expand this section"));
|
||||
panel.hide();
|
||||
} else {
|
||||
$(this).addClass("expanded").removeClass("collapsed").attr("title", __("Collapse this section") );
|
||||
$(this)
|
||||
.addClass("expanded")
|
||||
.removeClass("collapsed")
|
||||
.attr("title", __("Collapse this section"));
|
||||
panel.show();
|
||||
}
|
||||
});
|
||||
|
||||
$(".pref_sublink").on("click", function(){
|
||||
$(".pref_sublink").on("click", function () {
|
||||
/* If the user clicks a sub-menu link in the sidebar,
|
||||
check to see if it is collapsed. If so, expand it */
|
||||
var href = $(this).attr("href");
|
||||
href = href.replace("#","");
|
||||
var panel = $("#collapse_" + href );
|
||||
if( panel.is(":hidden") ){
|
||||
$("#" + href).addClass("expanded").removeClass("collapsed").attr("title", __("Collapse this section") );
|
||||
href = href.replace("#", "");
|
||||
var panel = $("#collapse_" + href);
|
||||
if (panel.is(":hidden")) {
|
||||
$("#" + href)
|
||||
.addClass("expanded")
|
||||
.removeClass("collapsed")
|
||||
.attr("title", __("Collapse this section"));
|
||||
panel.show();
|
||||
}
|
||||
});
|
||||
|
||||
if ( to_highlight ) {
|
||||
var words = to_highlight.split( ' ' );
|
||||
$( '.prefs-tab table' ).find( 'td, th' ).not( '.name-cell' ).each( function ( i, td ) {
|
||||
$.each( words, function ( i, word ) { $( td ).highlight( word ) } );
|
||||
} ).find( 'option, textarea' ).removeHighlight();
|
||||
if (to_highlight) {
|
||||
var words = to_highlight.split(" ");
|
||||
$(".prefs-tab table")
|
||||
.find("td, th")
|
||||
.not(".name-cell")
|
||||
.each(function (i, td) {
|
||||
$.each(words, function (i, word) {
|
||||
$(td).highlight(word);
|
||||
});
|
||||
})
|
||||
.find("option, textarea")
|
||||
.removeHighlight();
|
||||
}
|
||||
|
||||
if ( search_jumped ) {
|
||||
if (search_jumped) {
|
||||
document.location.hash = "jumped";
|
||||
}
|
||||
|
||||
$("#pref_UpdateItemLocationOnCheckin, #pref_UpdateItemLocationOnCheckout").change(function(){
|
||||
$(
|
||||
"#pref_UpdateItemLocationOnCheckin, #pref_UpdateItemLocationOnCheckout"
|
||||
).change(function () {
|
||||
var the_text = $(this).val();
|
||||
var alert_text = '';
|
||||
if (the_text.indexOf('_ALL_:') != -1) alert_text = __("Note: _ALL_ value will override all other values") + '\n';
|
||||
var split_text =the_text.split("\n");
|
||||
var alert_issues = '';
|
||||
var alert_text = "";
|
||||
if (the_text.indexOf("_ALL_:") != -1)
|
||||
alert_text =
|
||||
__("Note: _ALL_ value will override all other values") + "\n";
|
||||
var split_text = the_text.split("\n");
|
||||
var alert_issues = "";
|
||||
var issue_count = 0;
|
||||
var reg_check = /.*:\s.*/;
|
||||
for (var i=0; i < split_text.length; i++){
|
||||
if ( !split_text[i].match(reg_check) && split_text[i].length ) {
|
||||
alert_issues+=split_text[i]+"\n";
|
||||
for (var i = 0; i < split_text.length; i++) {
|
||||
if (!split_text[i].match(reg_check) && split_text[i].length) {
|
||||
alert_issues += split_text[i] + "\n";
|
||||
issue_count++;
|
||||
}
|
||||
}
|
||||
if (issue_count) alert_text += "\n" + __("The following values are not formatted correctly:") + "\n" + alert_issues;
|
||||
if ( alert_text.length ) alert(alert_text);
|
||||
if (issue_count)
|
||||
alert_text +=
|
||||
"\n" +
|
||||
__("The following values are not formatted correctly:") +
|
||||
"\n" +
|
||||
alert_issues;
|
||||
if (alert_text.length) alert(alert_text);
|
||||
});
|
||||
|
||||
$(".prefs-tab form").each(function () {
|
||||
$(this).validate({
|
||||
rules: { },
|
||||
errorPlacement: function(error, element) {
|
||||
rules: {},
|
||||
errorPlacement: function (error, element) {
|
||||
var placement = $(element).parent();
|
||||
if (placement) {
|
||||
$(placement).append(error)
|
||||
$(placement).append(error);
|
||||
} else {
|
||||
error.insertAfter(element);
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
$(".preference-email").each(function() {
|
||||
$(".preference-email").each(function () {
|
||||
$(this).rules("add", {
|
||||
email: true
|
||||
email: true,
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
$(".modalselect").on("click", function(){
|
||||
$(".modalselect").on("click", function () {
|
||||
var datasource = $(this).data("source");
|
||||
var exclusions = $(this).data("exclusions").split('|');
|
||||
var inclusions = $(this).data("inclusions").split('|');
|
||||
var required = $(this).data("required").split('|');
|
||||
var pref_name = this.id.replace(/pref_/, '');
|
||||
var exclusions = $(this).data("exclusions").split("|");
|
||||
var inclusions = $(this).data("inclusions").split("|");
|
||||
var required = $(this).data("required").split("|");
|
||||
var pref_name = this.id.replace(/pref_/, "");
|
||||
var pref_value = this.value;
|
||||
var prefs = pref_value.split("|");
|
||||
|
||||
|
|
@ -309,45 +380,60 @@ $(".modalselect").on("click", function(){
|
|||
var readonly = "";
|
||||
var disabled = "";
|
||||
var style = "";
|
||||
$.each( Object.keys(data).sort(), function( i, key ){
|
||||
if( prefs.indexOf( key ) >= 0 ){
|
||||
$.each(Object.keys(data).sort(), function (i, key) {
|
||||
if (prefs.indexOf(key) >= 0) {
|
||||
checked = ' checked="checked" ';
|
||||
} else {
|
||||
checked = "";
|
||||
}
|
||||
if( required.indexOf( key ) >= 0 ){
|
||||
if (required.indexOf(key) >= 0) {
|
||||
style = "required";
|
||||
checked = ' checked="checked" ';
|
||||
} else if( exclusions.indexOf( key ) >= 0 ){
|
||||
checked = ' checked="checked" ';
|
||||
} else if (exclusions.indexOf(key) >= 0) {
|
||||
style = "disabled";
|
||||
disabled = ' disabled="disabled" ';
|
||||
checked = "";
|
||||
} else if( inclusions.indexOf( key ) >= 0 ){
|
||||
checked = "";
|
||||
} else if (inclusions.indexOf(key) >= 0) {
|
||||
style = "disabled";
|
||||
disabled = ' disabled="disabled" ';
|
||||
checked = ' checked="checked" ';
|
||||
checked = ' checked="checked" ';
|
||||
} else {
|
||||
style = "";
|
||||
disabled = "";
|
||||
}
|
||||
|
||||
items.push('<label class="' + style +'"><input class="dbcolumn_selection" type="checkbox" id="' + key + '"' + checked + disabled + ' name="pref" value="' + key + '" /> ' + data[key]+ ' (' + key + ')</label>');
|
||||
items.push(
|
||||
'<label class="' +
|
||||
style +
|
||||
'"><input class="dbcolumn_selection" type="checkbox" id="' +
|
||||
key +
|
||||
'"' +
|
||||
checked +
|
||||
disabled +
|
||||
' name="pref" value="' +
|
||||
key +
|
||||
'" /> ' +
|
||||
data[key] +
|
||||
" (" +
|
||||
key +
|
||||
")</label>"
|
||||
);
|
||||
});
|
||||
$("<div/>", {
|
||||
"class": "columns-2",
|
||||
html: items.join("")
|
||||
class: "columns-2",
|
||||
html: items.join(""),
|
||||
}).appendTo("#prefModalBody");
|
||||
|
||||
$("#saveModalPrefs").data("target", this.id );
|
||||
$("#saveModalPrefs").data("type", "modalselect" );
|
||||
$("#prefModalLabel").text( pref_name );
|
||||
$("#saveModalPrefs").data("target", this.id);
|
||||
$("#saveModalPrefs").data("type", "modalselect");
|
||||
$("#prefModalLabel").text(pref_name);
|
||||
$("#prefModal").modal("show");
|
||||
});
|
||||
|
||||
// Initialise the content of our modal, using the function
|
||||
// specified in the data-initiator attribute
|
||||
$('.modaljs').on('click', function () {
|
||||
const init = $(this).data('initiator');
|
||||
$(".modaljs").on("click", function () {
|
||||
const init = $(this).data("initiator");
|
||||
if (init) {
|
||||
window[init](this);
|
||||
$("#prefModal").modal("show");
|
||||
|
|
@ -358,9 +444,9 @@ $('.modaljs').on('click', function () {
|
|||
// with a modalselect modal
|
||||
function prepareModalSelect(formfieldid) {
|
||||
var prefs = [];
|
||||
$("#prefModal input[type='checkbox']").each(function(){
|
||||
if( $(this).prop("checked") ){
|
||||
prefs.push( this.value );
|
||||
$("#prefModal input[type='checkbox']").each(function () {
|
||||
if ($(this).prop("checked")) {
|
||||
prefs.push(this.value);
|
||||
}
|
||||
});
|
||||
return prefs.join("|");
|
||||
|
|
@ -368,81 +454,173 @@ function prepareModalSelect(formfieldid) {
|
|||
|
||||
// Return a checkbox with an appropriate checked state
|
||||
function checkBox(id, className, state) {
|
||||
return state ?
|
||||
'<input id="' + id + '" type="checkbox" class="' + className + '" checked>' :
|
||||
'<input id="' + id + '" type="checkbox" class="' + className + '">';
|
||||
return state
|
||||
? '<input id="' +
|
||||
id +
|
||||
'" type="checkbox" class="' +
|
||||
className +
|
||||
'" checked>'
|
||||
: '<input id="' + id + '" type="checkbox" class="' + className + '">';
|
||||
}
|
||||
|
||||
// Create a cookieConsentedJS item, correctly populated
|
||||
function createCookieConsentedJSItem(item, idx) {
|
||||
const id = 'CookieConsentedJS_' + idx;
|
||||
const code = item.code && item.code.length > 0 ? atob(item.code) : '';
|
||||
const itemId = item.id && item.id.length > 0 ? item.id : '';
|
||||
return '<div id="' + id + '" class="cookieConsentedJSItem" data-id="' + itemId + '">' +
|
||||
' <div class="consentRow">' +
|
||||
' <div class="consentItem">' +
|
||||
' <label class="required" for="name_' + id + '">' + __('Name') + ':</label>' +
|
||||
' <input id="name_' + id + '" class="metaName" type="text" value="' + item.name + '"><span class="required">' + __('Required') + '</span>' +
|
||||
' </div >' +
|
||||
' <div class="consentItem">' +
|
||||
' <label class="required" for="description_' + id + '">' + __('Description') + ':</label>' +
|
||||
' <input id="description_' + id + '" class="metaDescription" type="text" value="' + item.description + '"><span class="required">' + __('Required') + '</span>' +
|
||||
' </div>' +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="opacConsent_' + id + '">' + __('Requires consent in OPAC') + ':</label>' +
|
||||
checkBox('opacConsent_' + id, 'opacConsent', item.opacConsent) +
|
||||
' </div>' +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="staffConsent_' + id + '">' + __('Requires consent in staff interface') + ':</label>' +
|
||||
checkBox('staffConsent_' + id, 'staffConsent', item.staffConsent) +
|
||||
' </div >' +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="matchPattern_' + id + '">' + __('String used to identify cookie name') + ':</label>' +
|
||||
' <input id="matchPattern_' + id + '" class="metaMatchPattern" type="text" value="' + item.matchPattern + '"><span class="required">' + __('Required') + '</span>' +
|
||||
' </div >' +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="cookieDomain' + id + '">' + __('Cookie domain') + ':</label>' +
|
||||
' <input id="cookieDomain' + id + '" class="metaCookieDomain" type="text" value="' + item.cookieDomain + '"><span class="required">' + __('Required') + '</span>' +
|
||||
' </div >' +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="cookiePath' + id + '">' + __('Cookie path') + ':</label>' +
|
||||
' <input id="cookiePath' + id + '" class="metaCookiePath" type="text" value="' + item.cookiePath + '"><span class="required">' + __('Required') + '</span>' +
|
||||
' </div >' +
|
||||
' </div >' +
|
||||
' <div class="consentRow codeRow">' +
|
||||
' <textarea style="display:none;" id="pref_' + id + '" class="preference preference-code codemirror" rows="10" cols="40">' + code + '</textarea>' +
|
||||
' <div>' +
|
||||
' <a id="expand_' + id + '" class="expand-textarea" data-target="' + id + '" data-syntax="javascript" href="#">' + __('Expand') + '</a>' +
|
||||
' <a id="collapse_' + id + '" class="collapse-textarea" data-target="' + id + '" data-syntax="javascript" href="#" style="display:none">' + __('Collapse') + '</a>' +
|
||||
' </div >' +
|
||||
' </div>' +
|
||||
' <a class="consentDelete" data-target="' + id + '" href="#">' + __('Delete') + '</a>' +
|
||||
'</div > ';
|
||||
const id = "CookieConsentedJS_" + idx;
|
||||
const code = item.code && item.code.length > 0 ? atob(item.code) : "";
|
||||
const itemId = item.id && item.id.length > 0 ? item.id : "";
|
||||
return (
|
||||
'<div id="' +
|
||||
id +
|
||||
'" class="cookieConsentedJSItem" data-id="' +
|
||||
itemId +
|
||||
'">' +
|
||||
' <div class="consentRow">' +
|
||||
' <div class="consentItem">' +
|
||||
' <label class="required" for="name_' +
|
||||
id +
|
||||
'">' +
|
||||
__("Name") +
|
||||
":</label>" +
|
||||
' <input id="name_' +
|
||||
id +
|
||||
'" class="metaName" type="text" value="' +
|
||||
item.name +
|
||||
'"><span class="required">' +
|
||||
__("Required") +
|
||||
"</span>" +
|
||||
" </div >" +
|
||||
' <div class="consentItem">' +
|
||||
' <label class="required" for="description_' +
|
||||
id +
|
||||
'">' +
|
||||
__("Description") +
|
||||
":</label>" +
|
||||
' <input id="description_' +
|
||||
id +
|
||||
'" class="metaDescription" type="text" value="' +
|
||||
item.description +
|
||||
'"><span class="required">' +
|
||||
__("Required") +
|
||||
"</span>" +
|
||||
" </div>" +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="opacConsent_' +
|
||||
id +
|
||||
'">' +
|
||||
__("Requires consent in OPAC") +
|
||||
":</label>" +
|
||||
checkBox("opacConsent_" + id, "opacConsent", item.opacConsent) +
|
||||
" </div>" +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="staffConsent_' +
|
||||
id +
|
||||
'">' +
|
||||
__("Requires consent in staff interface") +
|
||||
":</label>" +
|
||||
checkBox("staffConsent_" + id, "staffConsent", item.staffConsent) +
|
||||
" </div >" +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="matchPattern_' +
|
||||
id +
|
||||
'">' +
|
||||
__("String used to identify cookie name") +
|
||||
":</label>" +
|
||||
' <input id="matchPattern_' +
|
||||
id +
|
||||
'" class="metaMatchPattern" type="text" value="' +
|
||||
item.matchPattern +
|
||||
'"><span class="required">' +
|
||||
__("Required") +
|
||||
"</span>" +
|
||||
" </div >" +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="cookieDomain' +
|
||||
id +
|
||||
'">' +
|
||||
__("Cookie domain") +
|
||||
":</label>" +
|
||||
' <input id="cookieDomain' +
|
||||
id +
|
||||
'" class="metaCookieDomain" type="text" value="' +
|
||||
item.cookieDomain +
|
||||
'"><span class="required">' +
|
||||
__("Required") +
|
||||
"</span>" +
|
||||
" </div >" +
|
||||
' <div class="consentItem">' +
|
||||
' <label for="cookiePath' +
|
||||
id +
|
||||
'">' +
|
||||
__("Cookie path") +
|
||||
":</label>" +
|
||||
' <input id="cookiePath' +
|
||||
id +
|
||||
'" class="metaCookiePath" type="text" value="' +
|
||||
item.cookiePath +
|
||||
'"><span class="required">' +
|
||||
__("Required") +
|
||||
"</span>" +
|
||||
" </div >" +
|
||||
" </div >" +
|
||||
' <div class="consentRow codeRow">' +
|
||||
' <textarea style="display:none;" id="pref_' +
|
||||
id +
|
||||
'" class="preference preference-code codemirror" rows="10" cols="40">' +
|
||||
code +
|
||||
"</textarea>" +
|
||||
" <div>" +
|
||||
' <a id="expand_' +
|
||||
id +
|
||||
'" class="expand-textarea" data-target="' +
|
||||
id +
|
||||
'" data-syntax="javascript" href="#">' +
|
||||
__("Expand") +
|
||||
"</a>" +
|
||||
' <a id="collapse_' +
|
||||
id +
|
||||
'" class="collapse-textarea" data-target="' +
|
||||
id +
|
||||
'" data-syntax="javascript" href="#" style="display:none">' +
|
||||
__("Collapse") +
|
||||
"</a>" +
|
||||
" </div >" +
|
||||
" </div>" +
|
||||
' <a class="consentDelete" data-target="' +
|
||||
id +
|
||||
'" href="#">' +
|
||||
__("Delete") +
|
||||
"</a>" +
|
||||
"</div > "
|
||||
);
|
||||
}
|
||||
|
||||
// Return the markup for all cookieConsentedJS items concatenated
|
||||
function populateConsentMarkup(items) {
|
||||
return items.reduce(function (acc, current, idx) {
|
||||
return acc + createCookieConsentedJSItem(current, idx);
|
||||
}, '');
|
||||
}, "");
|
||||
}
|
||||
|
||||
// Return the markup for a validation warning
|
||||
function populateValidationWarning() {
|
||||
return '<div id="cookieConsentedJSWarning" class="error" style="display:none;">' + __('You must complete all fields') + '</div>';
|
||||
return (
|
||||
'<div id="cookieConsentedJSWarning" class="error" style="display:none;">' +
|
||||
__("You must complete all fields") +
|
||||
"</div>"
|
||||
);
|
||||
}
|
||||
|
||||
// Return a new, empty consent item
|
||||
function emptyConsentItem() {
|
||||
return {
|
||||
name: '',
|
||||
description: '',
|
||||
matchPattern: '',
|
||||
cookieDomain: '',
|
||||
cookiePath: '',
|
||||
code: '',
|
||||
name: "",
|
||||
description: "",
|
||||
matchPattern: "",
|
||||
cookieDomain: "",
|
||||
cookiePath: "",
|
||||
code: "",
|
||||
opacConsent: false,
|
||||
staffConsent: false
|
||||
staffConsent: false,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -450,10 +628,10 @@ function emptyConsentItem() {
|
|||
function addNewHandler() {
|
||||
$("#cookieConsentedJSAddNew").on("click", function (e) {
|
||||
e.preventDefault();
|
||||
const currentLen = $('.cookieConsentedJSItem').length;
|
||||
const currentLen = $(".cookieConsentedJSItem").length;
|
||||
const newItem = emptyConsentItem();
|
||||
const markup = createCookieConsentedJSItem(newItem, currentLen);
|
||||
$('#prefModal .modal-body #cookieConsentedJSItems').append($(markup));
|
||||
$("#prefModal .modal-body #cookieConsentedJSItems").append($(markup));
|
||||
addExpandHandler();
|
||||
addCollapseHandler();
|
||||
addConsentDeleteHandler();
|
||||
|
|
@ -467,38 +645,47 @@ function addNewHandler() {
|
|||
// (e.g.)
|
||||
// const f = 'populateCookieConsentedJS';
|
||||
// window[f]();
|
||||
window.populateCookieConsentedJS = function(el) {
|
||||
window.populateCookieConsentedJS = function (el) {
|
||||
let items = [];
|
||||
let decoded = '';
|
||||
let decoded = "";
|
||||
if (el.value && el.value.length > 0) {
|
||||
try {
|
||||
decoded = atob(el.value);
|
||||
} catch (err) {
|
||||
throw (__(
|
||||
'Unable to Base64 decode value stored in CookieConsentedJS syspref: ' +
|
||||
err.message
|
||||
));
|
||||
throw __(
|
||||
"Unable to Base64 decode value stored in CookieConsentedJS syspref: " +
|
||||
err.message
|
||||
);
|
||||
}
|
||||
try {
|
||||
items = JSON.parse(decoded);
|
||||
} catch (err) {
|
||||
throw (__(
|
||||
'Unable to JSON parse decoded value stored in CookieConsentedJS syspref: ' +
|
||||
err.message
|
||||
));
|
||||
throw __(
|
||||
"Unable to JSON parse decoded value stored in CookieConsentedJS syspref: " +
|
||||
err.message
|
||||
);
|
||||
}
|
||||
}
|
||||
const markup = populateConsentMarkup(items);
|
||||
const validationWarning = populateValidationWarning();
|
||||
const pref_name = el.id.replace(/pref_/, '');
|
||||
$('#saveModalPrefs').data('target', el.id);
|
||||
$('#prefModalLabel').text( pref_name );
|
||||
$('#prefModal .modal-body').html($('<div id="cookieConsentedJSItems">' + validationWarning + markup + '</div><div><a href="#" id="cookieConsentedJSAddNew">' + __('Add new code') + '</a></div>'));
|
||||
const pref_name = el.id.replace(/pref_/, "");
|
||||
$("#saveModalPrefs").data("target", el.id);
|
||||
$("#prefModalLabel").text(pref_name);
|
||||
$("#prefModal .modal-body").html(
|
||||
$(
|
||||
'<div id="cookieConsentedJSItems">' +
|
||||
validationWarning +
|
||||
markup +
|
||||
'</div><div><a href="#" id="cookieConsentedJSAddNew">' +
|
||||
__("Add new code") +
|
||||
"</a></div>"
|
||||
)
|
||||
);
|
||||
addExpandHandler();
|
||||
addCollapseHandler();
|
||||
addNewHandler();
|
||||
addConsentDeleteHandler();
|
||||
}
|
||||
};
|
||||
|
||||
// Prepare the data in the UI for sending back as a syspref.
|
||||
// We validate that everything is what we expect. This function is added
|
||||
|
|
@ -508,21 +695,22 @@ window.populateCookieConsentedJS = function(el) {
|
|||
// const f = 'prepareCookieConsentedJS';
|
||||
// window[f]();
|
||||
window.prepareCookieConsentedJS = function () {
|
||||
const items = $('.cookieConsentedJSItem');
|
||||
const items = $(".cookieConsentedJSItem");
|
||||
const invalid = [];
|
||||
const valid = [];
|
||||
items.each(function () {
|
||||
const id = $(this).data('id').length > 0 ?
|
||||
$(this).data('id') :
|
||||
'_' + Math.random().toString(36).substr(2, 9);
|
||||
const name = $(this).find('.metaName').val();
|
||||
const desc = $(this).find('.metaDescription').val();
|
||||
const matchPattern = $(this).find('.metaMatchPattern').val();
|
||||
const cookieDomain = $(this).find('.metaCookieDomain').val();
|
||||
const cookiePath = $(this).find('.metaCookiePath').val();
|
||||
const opacConsent = $(this).find('.opacConsent').is(':checked')
|
||||
const staffConsent = $(this).find('.staffConsent').is(':checked');
|
||||
const code = $(this).find('.preference-code').val();
|
||||
const id =
|
||||
$(this).data("id").length > 0
|
||||
? $(this).data("id")
|
||||
: "_" + Math.random().toString(36).substr(2, 9);
|
||||
const name = $(this).find(".metaName").val();
|
||||
const desc = $(this).find(".metaDescription").val();
|
||||
const matchPattern = $(this).find(".metaMatchPattern").val();
|
||||
const cookieDomain = $(this).find(".metaCookieDomain").val();
|
||||
const cookiePath = $(this).find(".metaCookiePath").val();
|
||||
const opacConsent = $(this).find(".opacConsent").is(":checked");
|
||||
const staffConsent = $(this).find(".staffConsent").is(":checked");
|
||||
const code = $(this).find(".preference-code").val();
|
||||
// If the name, description, match pattern code are empty, then they've
|
||||
// added a new entry, but not filled it in, we can skip it
|
||||
if (
|
||||
|
|
@ -537,11 +725,11 @@ window.prepareCookieConsentedJS = function () {
|
|||
}
|
||||
// They've filled in at least some info
|
||||
if (
|
||||
(name.length === 0) ||
|
||||
(desc.length === 0) ||
|
||||
(matchPattern.length === 0) ||
|
||||
(cookiePath.length === 0) ||
|
||||
(code.length === 0)
|
||||
name.length === 0 ||
|
||||
desc.length === 0 ||
|
||||
matchPattern.length === 0 ||
|
||||
cookiePath.length === 0 ||
|
||||
code.length === 0
|
||||
) {
|
||||
invalid.push(this);
|
||||
} else {
|
||||
|
|
@ -554,26 +742,26 @@ window.prepareCookieConsentedJS = function () {
|
|||
cookiePath: cookiePath,
|
||||
opacConsent: opacConsent,
|
||||
staffConsent: staffConsent,
|
||||
code: btoa(code)
|
||||
}
|
||||
code: btoa(code),
|
||||
};
|
||||
valid.push(obj);
|
||||
}
|
||||
});
|
||||
// We failed validation
|
||||
if (invalid.length > 0) {
|
||||
$('#cookieConsentedJSWarning').show();
|
||||
$("#cookieConsentedJSWarning").show();
|
||||
return false;
|
||||
}
|
||||
$('#cookieConsentedJSWarning').hide();
|
||||
$("#cookieConsentedJSWarning").hide();
|
||||
if (valid.length === 0) {
|
||||
return '';
|
||||
return "";
|
||||
}
|
||||
const json = JSON.stringify(valid);
|
||||
const base64 = btoa(json);
|
||||
return base64;
|
||||
}
|
||||
};
|
||||
|
||||
$("#saveModalPrefs").on("click", function(){
|
||||
$("#saveModalPrefs").on("click", function () {
|
||||
var formfieldid = $("#" + $(this).data("target"));
|
||||
let finalString = "";
|
||||
if ($(this).data("type") == "modalselect") {
|
||||
|
|
@ -586,26 +774,29 @@ $("#saveModalPrefs").on("click", function(){
|
|||
// data has failed validation
|
||||
if (finalString !== false) {
|
||||
formfieldid.val(finalString).addClass("modified");
|
||||
mark_modified.call( formfieldid );
|
||||
KOHA.Preferences.Save( formfieldid.closest("form") );
|
||||
mark_modified.call(formfieldid);
|
||||
KOHA.Preferences.Save(formfieldid.closest("form"));
|
||||
$("#prefModal").modal("hide");
|
||||
}
|
||||
});
|
||||
|
||||
$("#prefModal").on("hide.bs.modal", function(){
|
||||
$("#prefModal").on("hide.bs.modal", function () {
|
||||
$("#prefModalLabel,#prefModalBody").html("");
|
||||
$("#saveModalPrefs").data("target", "" );
|
||||
$("#saveModalPrefs").data("target", "");
|
||||
});
|
||||
|
||||
$("#select_all").on("click",function(e){
|
||||
$("#select_all").on("click", function (e) {
|
||||
e.preventDefault();
|
||||
$("label:not(.required) .dbcolumn_selection:not(:disabled)").prop("checked", true);
|
||||
$("label:not(.required) .dbcolumn_selection:not(:disabled)").prop(
|
||||
"checked",
|
||||
true
|
||||
);
|
||||
});
|
||||
$("#clear_all").on("click",function(e){
|
||||
$("#clear_all").on("click", function (e) {
|
||||
e.preventDefault();
|
||||
$("label:not(.required) .dbcolumn_selection").prop("checked", false);
|
||||
});
|
||||
|
||||
$("body").on("click", "label.required input.dbcolumn_selection", function(e){
|
||||
$("body").on("click", "label.required input.dbcolumn_selection", function (e) {
|
||||
e.preventDefault();
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue