diff --git a/README.md b/README.md index 69c00ba..7d8e491 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ This is just a spare-time project. The usage of this tool (especially in product * Prev Release: 1.1.6.4 - 08.04.2018 * Last Release: 1.1.6.5 - 26.05.2018 * Last Release: 1.1.7 - 18.10.2018 +* Last Release: 1.1.7.1 - 27.10.2018 [![Maven Central](https://img.shields.io/maven-central/v/de.chandre.admin-tools/admin-tools-core.svg)](https://mvnrepository.com/artifact/de.chandre.admin-tools) [![GitHub issues](https://img.shields.io/github/issues/andrehertwig/admintool.svg)](https://github.com/andrehertwig/admintool/issues) @@ -84,7 +85,7 @@ Include the dependencies in your dependency management. You can find it in [Mave de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 ... ``` diff --git a/admin-tools-core/README.md b/admin-tools-core/README.md index 518e1e7..a9d1adc 100644 --- a/admin-tools-core/README.md +++ b/admin-tools-core/README.md @@ -20,7 +20,7 @@ de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 ``` diff --git a/admin-tools-core/pom.xml b/admin-tools-core/pom.xml index 48f4896..7d08827 100644 --- a/admin-tools-core/pom.xml +++ b/admin-tools-core/pom.xml @@ -5,13 +5,13 @@ de.chandre.admin-tools - admin-tools - + admin-tools + 1.2.0-SNAPSHOT - ../ - - - admin-tools-core + ../ + + + admin-tools-core admin-tools core componenets admin-tools core componenets diff --git a/admin-tools-dbbrowser/README.md b/admin-tools-dbbrowser/README.md index 667ecd4..74bce3b 100644 --- a/admin-tools-dbbrowser/README.md +++ b/admin-tools-dbbrowser/README.md @@ -32,12 +32,12 @@ Result will be displayed via jquery.datatables de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 de.chandre.admin-tools admin-tools-dbbrowser - 1.1.7 + 1.1.7.1 ``` diff --git a/admin-tools-filebrowser/README.md b/admin-tools-filebrowser/README.md index 2ca213a..619a60e 100644 --- a/admin-tools-filebrowser/README.md +++ b/admin-tools-filebrowser/README.md @@ -34,12 +34,12 @@ de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 de.chandre.admin-tools admin-tools-filebrowser - 1.1.7 + 1.1.7.1 ``` diff --git a/admin-tools-jminix/README.md b/admin-tools-jminix/README.md index ecbdf67..da731b4 100644 --- a/admin-tools-jminix/README.md +++ b/admin-tools-jminix/README.md @@ -12,12 +12,12 @@ de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 de.chandre.admin-tools admin-tools-jminix - 1.1.7 + 1.1.7.1 ``` diff --git a/admin-tools-log4j2/README.md b/admin-tools-log4j2/README.md index b0730d7..3f25802 100644 --- a/admin-tools-log4j2/README.md +++ b/admin-tools-log4j2/README.md @@ -17,12 +17,12 @@ Since 1.1.6.4 it's possible to add new Logger with available appenders de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 de.chandre.admin-tools admin-tools-log4j2 - 1.1.7 + 1.1.7.1 ``` diff --git a/admin-tools-log4j2/src/main/resources/static/admintool/js/log4j2.js b/admin-tools-log4j2/src/main/resources/static/admintool/js/log4j2.js index 69c3cc3..4ddeb63 100644 --- a/admin-tools-log4j2/src/main/resources/static/admintool/js/log4j2.js +++ b/admin-tools-log4j2/src/main/resources/static/admintool/js/log4j2.js @@ -25,17 +25,24 @@ $.extend(AdminTool.Log4j.Loggers.prototype, { }, bind : function() { + var ctx = this; if($('#parentLoggers').length > 0) { - $('#parentLoggers').on('init.dt', $.proxy(this.initEvents, this)).dataTable(); - $('#parentLoggers').on('page.dt', $.proxy(this.initEvents, this)); + var dataTableRoot = $('#parentLoggers').DataTable(); + dataTableRoot.on( 'draw', function() { + console.log( 'Redraw root finished'); + getByID('log4jContent').adminToolLog4jLoggers('initButtons', '.root'); + }); } - var eventsInitialized = false; if($('#loggers').length > 0) { - $('#loggers').on('init.dt', $.proxy(this.initEvents, this)).dataTable(); - $('#loggers').on('page.dt', $.proxy(this.initEvents, this)); - eventsInitialized = true; + var dataTable = $('#loggers').DataTable(); + dataTable.on( 'draw', function() { + console.log( 'Redraw child finished'); + getByID('log4jContent').adminToolLog4jLoggers('initButtons', '.child'); + }); } + this.initEvents(); + if($('.removeCustomLogger').length > 0) { $('.removeCustomLogger').click(function(){ sendRequest("/admintool/log4j2/removeCustomLoggers", "POST", "text", function(data) { @@ -54,25 +61,29 @@ $.extend(AdminTool.Log4j.Loggers.prototype, { }, initEvents : function() { - $('.changeLogger').each(function() { - var $el = $(this); - $el.unbind('click'); - $el.on({'click': function(){ - getByID('log4jContent').adminToolLog4jLoggers('changeLogLevel', $el)} - }); + this.initButtons(); + getByID('addCustomLogger').on('click', function(){ + getByID('log4jContent').adminToolLog4jLoggers('manageLogger', null); }); - $('.manageLogger').each(function() { + + this.initModalInputs(); + }, + + initButtons: function(loggergroupclazz='') { + $(loggergroupclazz+'.changeLogger').each(function() { + var $el = $(this); + $el.unbind('click'); + $el.on('click', function(){ + getByID('log4jContent').adminToolLog4jLoggers('changeLogLevel', $el); + }); + }); + $(loggergroupclazz+'.manageLogger').each(function() { var $el = $(this); $el.unbind('click'); - $el.on({'click': function(){ - getByID('log4jContent').adminToolLog4jLoggers('manageLogger', $el)} + $el.on('click', function(){ + getByID('log4jContent').adminToolLog4jLoggers('manageLogger', $el); }); }); - getByID('addCustomLogger').on({'click': function(){ - getByID('log4jContent').adminToolLog4jLoggers('manageLogger', null)} - }); - - this.initModalInputs(); }, initModalInputs: function() { diff --git a/admin-tools-log4j2/src/main/resources/templates/admintool/content/log4j2.html b/admin-tools-log4j2/src/main/resources/templates/admintool/content/log4j2.html index a9f782e..db0519d 100644 --- a/admin-tools-log4j2/src/main/resources/templates/admintool/content/log4j2.html +++ b/admin-tools-log4j2/src/main/resources/templates/admintool/content/log4j2.html @@ -57,11 +57,11 @@

@@ -114,7 +114,7 @@

diff --git a/admin-tools-melody/README.md b/admin-tools-melody/README.md index 75d980e..ca3a674 100644 --- a/admin-tools-melody/README.md +++ b/admin-tools-melody/README.md @@ -22,12 +22,12 @@ http de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 de.chandre.admin-tools admin-tools-melody - 1.1.7 + 1.1.7.1 ``` diff --git a/admin-tools-properties/README.md b/admin-tools-properties/README.md index 9e1353b..b39c39a 100644 --- a/admin-tools-properties/README.md +++ b/admin-tools-properties/README.md @@ -12,12 +12,12 @@ de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 de.chandre.admin-tools admin-tools-properties - 1.1.7 + 1.1.7.1 ``` diff --git a/admin-tools-quartz/README.md b/admin-tools-quartz/README.md index 1a8983c..827102e 100644 --- a/admin-tools-quartz/README.md +++ b/admin-tools-quartz/README.md @@ -22,12 +22,12 @@ de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 de.chandre.admin-tools admin-tools-quartz - 1.1.7 + 1.1.7.1 ``` diff --git a/admin-tools-security/admin-tools-security-simple/README.md b/admin-tools-security/admin-tools-security-simple/README.md index eba39d8..3e770c8 100644 --- a/admin-tools-security/admin-tools-security-simple/README.md +++ b/admin-tools-security/admin-tools-security-simple/README.md @@ -19,12 +19,12 @@ Until version 1.1.6 the following dependencies must be used. de.chandre.admin-tools admin-tools-core - 1.1.7 + 1.1.7.1 de.chandre.admin-tools admin-tools-core-security - 1.1.7 + 1.1.7.1 ```