From f2e1596e308567c82416f7a1ca09b14bf6a6e71d Mon Sep 17 00:00:00 2001 From: igor Date: Fri, 9 Dec 2022 13:48:50 +0600 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BE=D1=87=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- metadata/dbms/DBMSRecords.java | 6 ++++-- metadata/dbms/showrecord.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/metadata/dbms/DBMSRecords.java b/metadata/dbms/DBMSRecords.java index c448030..7ff918a 100644 --- a/metadata/dbms/DBMSRecords.java +++ b/metadata/dbms/DBMSRecords.java @@ -1214,7 +1214,8 @@ public class DBMSRecords implements ServletContextAware { String recipient = login; String subject = "New password for CCALM from http://www.ccalm.org"; - String content = "Login is: "+ email.toLowerCase()+"\n
New password: " + newPass; + String content = "Login is: "+ email.toLowerCase()+"\n
New password: " + newPass+""; + content += "

Sincerely, the administration of ccalm.org."; String answer = ""; @@ -1398,7 +1399,8 @@ public class DBMSRecords implements ServletContextAware { //Отправляем пароль на Email String recipient = email; String subject = "Password for new user on http://www.ccalm.org"; - String content = "Login is: "+ email.toLowerCase()+"\n
Password: " + newPass; + String content = "Login is: "+ email.toLowerCase()+"\n
Password: " + newPass+""; + content += "

Sincerely, the administration of ccalm.org."; //String answer = ""; try { diff --git a/metadata/dbms/showrecord.js b/metadata/dbms/showrecord.js index a05687a..d08fc15 100644 --- a/metadata/dbms/showrecord.js +++ b/metadata/dbms/showrecord.js @@ -243,6 +243,7 @@ class SRec this.pBarDiv.innerHTML='
'; let eDiv=document.getElementById('eDiv'+this.uid); + if(eDiv==null) return; eDiv.appendChild(this.pBarDiv); } } @@ -566,7 +567,6 @@ class SRec } nodeFilter=findNodeOnPath(nodeType,"objects-list/filter"); - //let id=-1; //After loading the metadata, we request the data by sending an XML filter. let count=0;