Lint

Author: fdaugan

src/main/java/org/ligoj/app/plugin/id/resource/UserOrgResource.java

@@ -546,11 +546,7 @@ private boolean hasAttributeChange(final SimpleUser importEntry, boolean hasChan
 	@SafeVarargs
 	private boolean hasAttributeChange(final SimpleUser user1, final SimpleUser user2, final Function<SimpleUser, String>... equals) {
 		final var predicateFalse = Arrays.stream(equals).filter(f -> !StringUtils.equalsIgnoreCase(StringUtils.trimToNull(f.apply(user2)), StringUtils.trimToNull(f.apply(user1)))).findFirst().orElse(null);
-		if (predicateFalse == null) {
-			return false;
-		}
-		hasAttributeChange(user1, true, String.format("'%s' != '%s'", predicateFalse.apply(user1), predicateFalse.apply(user2)));
-		return true;
+		return predicateFalse != null && hasAttributeChange(user1, true, String.format("'%s' != '%s'", predicateFalse.apply(user1), predicateFalse.apply(user2)));
 	}
 
 	/**

src/main/resources/META-INF/resources/webjars/id/container/container.html

@@ -42,7 +42,7 @@ <h4 id="modal-title">...</h4>
 			</div>
 			<div class="modal-footer">
 				<input type="submit" class="btn btn-primary btn-raised" id="confirmCreate" value="{{save}}" data-loading-text="{{save}} ..." data-complete-text="{{save}}" />
-				<button class="btn btn-link" data-dismiss="modal" aria-hidden="true">
+				<button class="btn btn-link" data-dismiss="modal">
 					{{cancel}}
 				</button>
 			</div>

src/main/resources/META-INF/resources/webjars/id/user/change-password.html

@@ -31,7 +31,7 @@ <h4 class="modal-title" id="_change-label">{{change-password}}</h4>
 			</div>
 			<div class="modal-footer">
 				<input type="submit" class="btn btn-primary btn-raised" id="save" value="{{submit-reset}}" />
-				<button class="btn btn-link" data-dismiss="modal" aria-hidden="true">
+				<button class="btn btn-link" data-dismiss="modal">
 					{{cancel}}
 				</button>
 			</div>