Merge branch 'master' of https://git.dirt.kz/igor/Metadata_PHP
# Conflicts: # metadata/dbms/records.php
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
//Copyright (C) 2008 Ivanov I.M. irigm@mail.ru +77051809750
|
||||
//Copyright (C) 2008 Ivanov I.M. ivanov.i@istt.kz
|
||||
//For find non english chars: [^\x00-\x7F]+
|
||||
|
||||
function callWindow(uid,id,i)
|
||||
@ -50,9 +50,29 @@ class SRec
|
||||
this.hideProgressBar();
|
||||
|
||||
this.xmldoc=node.ownerDocument; //xmldoc;
|
||||
if (fn==-1) //Information menu
|
||||
if (fn==-1) //Information alert
|
||||
{
|
||||
alert2(trt('Alert'),findFirstNode(node,'#cdata-section').nodeValue);
|
||||
let fullText = findFirstNode(node,'#cdata-section').nodeValue;
|
||||
let smallText = '';
|
||||
let pos1=fullText.indexOf('[[');
|
||||
let pos2=fullText.indexOf(']]');
|
||||
if(pos1>0 && pos2>0 && pos1<pos2) smallText=fullText.substring(pos1+2, pos2);
|
||||
|
||||
if(fullText.indexOf("id456[[")>=0){ //Если есть идентификатор того что это перезапись
|
||||
let okFunc=()=>{
|
||||
this.setValue('seq',0);
|
||||
this.sendData(); //Применить ещё раз
|
||||
};
|
||||
if (smallText != '')
|
||||
confirm2(trt('Warning'),smallText, fullText, okFunc, null);
|
||||
else
|
||||
confirm2(trt('Warning'),smallText, '', okFunc, null);
|
||||
}else {
|
||||
if (smallText != '')
|
||||
alert2(trt('Alert'), smallText, fullText);
|
||||
else
|
||||
alert2(trt('Alert'), fullText);
|
||||
}
|
||||
}else
|
||||
if (fn==0)
|
||||
{
|
||||
@ -1608,7 +1628,7 @@ class SRec
|
||||
//We run through the marked records and request their removal
|
||||
deleteRecord(recordid)
|
||||
{
|
||||
confirm2(trt('Warning'),trt("Are_you_sure_you_want_to_delete_the_entries")+"<br>"
|
||||
confirm2(trt('Warning'),trt("Are_you_sure_you_want_to_delete_the_entries")+"<br>",''
|
||||
,()=>{
|
||||
for(let i=0;i<this.masChBox.length;i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user