Always allow skin selection

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentNoteDAO.java

@@ -51,25 +51,25 @@ public void store(DocumentNote note) throws PersistenceException {
 		updateLastNote(doc, note);
 	}
 
-	private void updateLastNote(Document doccument, DocumentNote note) {
+	private void updateLastNote(Document document, DocumentNote note) {
 		// In case of note on the whole document, update the document's lastNote
 		// field
 		if (note.getPage() == 0)
 			ThreadPools.get().execute(() -> {
 				try {
 					DocumentDAO dao = Context.get(DocumentDAO.class);
-					Document document = dao.findById(note.getDocId());
-					dao.initialize(document);
+					Document doc = dao.findById(note.getDocId());
+					dao.initialize(doc);
 
 					String lastNoteMessage = dao.queryForList(
-							"select ld_message from ld_note where ld_page=0 and ld_deleted=0 and ld_id=:id order by ld_date desc",
+							"select ld_message from ld_note where ld_page=0 and ld_deleted=0 and ld_docid=:id order by ld_date desc",
 							Map.of("id", note.getDocId()), String.class, null).stream().findFirst()
 							.orElse(note.getMessage());
 
-					document.setLastNote(HTMLSanitizer.sanitizeSimpleText(lastNoteMessage));
-					if (doccument.getIndexed() == AbstractDocument.INDEX_INDEXED)
-						doccument.setIndexed(AbstractDocument.INDEX_TO_INDEX);
-					dao.store(document);
+					doc.setLastNote(HTMLSanitizer.sanitizeSimpleText(lastNoteMessage));
+					if (document.getIndexed() == AbstractDocument.INDEX_INDEXED)
+						document.setIndexed(AbstractDocument.INDEX_TO_INDEX);
+					dao.store(doc);
 				} catch (PersistenceException e) {
 					log.error(e.getMessage(), e);
 				}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/tenant/TenantBrandingPanel.java

@@ -346,7 +346,7 @@ public void refresh() {
 		evaluation.setColSpan(2);
 		evaluation.setWidth(360);
 		evaluation.addChangedHandler(changedHandler);
-		
+
 		form.setItems(product, productName, vendor, address, postalCode, city, country, support, sales, webSite, help,
 				forum, bugs, evaluation);
 
@@ -548,8 +548,8 @@ else if (imageName.equals(FAVICON))
 
 	public boolean validate() {
 		vm.validate();
+		tenant.getBranding().setSkin(skin.getValueAsString());
 		if (Boolean.FALSE.equals(vm.hasErrors()) && Feature.enabled(Feature.BRANDING_FULL)) {
-			tenant.getBranding().setSkin(skin.getValueAsString());
 			tenant.getBranding().setProduct(vm.getValueAsString("product"));
 			tenant.getBranding().setProductName(vm.getValueAsString("productname"));
 			tenant.getBranding().setVendor(vm.getValueAsString("vendor"));
@@ -575,7 +575,7 @@ public void update(GUIBranding branding) {
 		if (changedHandler != null)
 			changedHandler.onChanged(null);
 	}
-	
+
 	@Override
 	public boolean equals(Object other) {
 		return super.equals(other);