mirror of
https://github.com/janeczku/calibre-web
synced 2025-10-29 22:33:01 +00:00
Merge remote-tracking branch 'ldap/master'
# Conflicts: # cps/admin.py # cps/templates/admin.html # cps/templates/config_edit.html # cps/web.py
This commit is contained in:
@@ -29,7 +29,6 @@ $(document).on("change", "input[type=\"checkbox\"][data-control]", function () {
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
// Generic control/related handler to show/hide fields based on a select' value
|
||||
$(document).on("change", "select[data-control]", function() {
|
||||
var $this = $(this);
|
||||
@@ -39,13 +38,26 @@ $(document).on("change", "select[data-control]", function() {
|
||||
for (var i = 0; i < $(this)[0].length; i++) {
|
||||
var element = parseInt($(this)[0][i].value);
|
||||
if (element === showOrHide) {
|
||||
$("[data-related=" + name + "-" + element + "]").show();
|
||||
$("[data-related^=" + name + "][data-related*=-" + element + "]").show();
|
||||
} else {
|
||||
$("[data-related=" + name + "-" + element + "]").hide();
|
||||
$("[data-related^=" + name + "][data-related*=-" + element + "]").hide();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Generic control/related handler to show/hide fields based on a select' value
|
||||
// this one is made to show all values if select value is not 0
|
||||
$(document).on("change", "select[data-controlall]", function() {
|
||||
var $this = $(this);
|
||||
var name = $this.data("controlall");
|
||||
var showOrHide = parseInt($this.val());
|
||||
if (showOrHide) {
|
||||
$("[data-related=" + name + "]").show();
|
||||
} else {
|
||||
$("[data-related=" + name + "]").hide();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
$(function() {
|
||||
var updateTimerID;
|
||||
@@ -214,6 +226,7 @@ $(function() {
|
||||
// Init all data control handlers to default
|
||||
$("input[data-control]").trigger("change");
|
||||
$("select[data-control]").trigger("change");
|
||||
$("select[data-controlall]").trigger("change");
|
||||
|
||||
$("#bookDetailsModal")
|
||||
.on("show.bs.modal", function(e) {
|
||||
@@ -274,6 +287,20 @@ $(function() {
|
||||
$(".discover .row").isotope("layout");
|
||||
});
|
||||
|
||||
$('#import_ldap_users').click(function() {
|
||||
var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length - 1].src;
|
||||
var path = src.substring(0, src.lastIndexOf("/"));
|
||||
/*$.ajax({
|
||||
method:"get",
|
||||
url: path + "/../../import_ldap_users",
|
||||
});*/
|
||||
$.getJSON(path + "/../../import_ldap_users",
|
||||
function(data) {
|
||||
location.reload();
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
$(".author-expand").click(function() {
|
||||
$(this).parent().find("a.author-name").slice($(this).data("authors-max")).toggle();
|
||||
$(this).parent().find("span.author-hidden-divider").toggle();
|
||||
|
||||
Reference in New Issue
Block a user