Merge branch 'master' into develop

# Conflicts: # README.md # admin-tools-core/README.md # admin-tools-core/pom.xml # admin-tools-dbbrowser/README.md # admin-tools-dbbrowser/pom.xml # admin-tools-demo-core/pom.xml # admin-tools-demo-jar/pom.xml # admin-tools-demo-war/pom.xml # admin-tools-filebrowser/README.md # admin-tools-filebrowser/pom.xml # admin-tools-jminix/README.md # admin-tools-jminix/pom.xml # admin-tools-log4j2/README.md # admin-tools-log4j2/pom.xml # admin-tools-melody/README.md # admin-tools-melody/pom.xml # admin-tools-properties/README.md # admin-tools-properties/pom.xml # admin-tools-quartz/README.md # admin-tools-quartz/pom.xml # admin-tools-security/admin-tools-security-simple/README.md # admin-tools-security/admin-tools-security-simple/pom.xml # pom.xml
andrehertwig · Oct 27, 2018 · 5c409e1 · 5c409e1
2 parents 52f96c0 + 842f761
commit 5c409e1
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 47 deletions.
diff --git 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
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 	...
 ```

diff --git a/admin-tools-core/README.md b/admin-tools-core/README.md
@@ -20,7 +20,7 @@
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 ```
 

diff --git a/admin-tools-core/pom.xml b/admin-tools-core/pom.xml
@@ -5,13 +5,13 @@
 
 	<parent>
         <groupId>de.chandre.admin-tools</groupId>
-		<artifactId>admin-tools</artifactId>
-		<!--<version>1.0.0</version>-->
+		<artifactId>admin-tools</artifactId>
+		<!--<version>1.0.0</version>-->
 		<version>1.2.0-SNAPSHOT</version> 
-		<relativePath>../</relativePath>
-    </parent>
-
-	<artifactId>admin-tools-core</artifactId>
+		<relativePath>../</relativePath>
+    </parent>
+
+	<artifactId>admin-tools-core</artifactId>
 
 	<name>admin-tools core componenets</name>
 	<description>admin-tools core componenets</description>

diff --git a/admin-tools-dbbrowser/README.md b/admin-tools-dbbrowser/README.md
@@ -32,12 +32,12 @@ Result will be displayed via jquery.datatables
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-dbbrowser</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 ```
 

diff --git a/admin-tools-filebrowser/README.md b/admin-tools-filebrowser/README.md
@@ -34,12 +34,12 @@
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-filebrowser</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 ```
 

diff --git a/admin-tools-jminix/README.md b/admin-tools-jminix/README.md
@@ -12,12 +12,12 @@
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-jminix</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 ```
 

diff --git 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
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-log4j2</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 ```
 

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
@@ -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
@@ -57,11 +57,11 @@ <h3 class="box-title">
 										<button
 											th:each="level, levelState : ${@adminToolLog4j2Util.getLevels()}"
 											th:text="${level}"
-											th:class="'changeLogger btn btn-xs ' +  ${@adminToolLog4j2Util.getLoggerLevelCss('btn', level)}">
+											th:class="'root changeLogger btn btn-xs ' +  ${@adminToolLog4j2Util.getLoggerLevelCss('btn', level)}">
 										</button>
 										<button
 											th:title="Change"
-											class="manageLogger btn btn-xs">
+											class="root manageLogger btn btn-xs">
 											<i class="fa fa-wrench" aria-hidden="true"></i>
 										</button>
 									</td>
@@ -114,7 +114,7 @@ <h3 class="box-title">
 										<button
 											th:each="level, levelState : ${@adminToolLog4j2Util.getLevels()}"
 											th:text="${level}"
-											th:class="'changeLogger btn btn-xs ' +  ${@adminToolLog4j2Util.getLoggerLevelCss('btn', level)}">
+											th:class="'child changeLogger btn btn-xs ' +  ${@adminToolLog4j2Util.getLoggerLevelCss('btn', level)}">
 										</button>
 									</td>
 								</tr>

diff --git a/admin-tools-melody/README.md b/admin-tools-melody/README.md
@@ -22,12 +22,12 @@ http
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-melody</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 ```
 

diff --git a/admin-tools-properties/README.md b/admin-tools-properties/README.md
@@ -12,12 +12,12 @@
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-properties</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 ```
 

diff --git a/admin-tools-quartz/README.md b/admin-tools-quartz/README.md
@@ -22,12 +22,12 @@
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-quartz</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 ```
 

diff --git 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.
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 <dependency>
 	<groupId>de.chandre.admin-tools</groupId>
 	<artifactId>admin-tools-core-security</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.7.1</version>
 </dependency>
 ```