diff --git a/metadata/dbms/records.php b/metadata/dbms/records.php
index 832f227..98e8f7e 100644
--- a/metadata/dbms/records.php
+++ b/metadata/dbms/records.php
@@ -19,6 +19,7 @@
//include("../include/toExcell.php");
//require_once("config.php");
+
function getCurrentDirectory() {
$path = dirname($_SERVER['PHP_SELF']);
$position = strrpos($path,'/') + 1;
@@ -242,7 +243,7 @@
$reqid = $reqNode->getAttribute("reqid"); //Уникальный id запроса
}
}
-
+
//error_log($HTTP_INPUT);
//описание
diff --git a/metadata/dbms/showrecord.js b/metadata/dbms/showrecord.js
index f88bacf..a91e9c7 100644
--- a/metadata/dbms/showrecord.js
+++ b/metadata/dbms/showrecord.js
@@ -125,13 +125,9 @@ class SRec
setXMLSettings(xml)
{
//Apply the parameters to the current XML filter if there are filter settings in the parent window!
- if(xml===null || typeof(xml) == "undefined") return;
-
+ if(xml===null || typeof(xml) == "undefined" || xml=="") return;
if(typeof(xml) == "string"){
- if(xml!="")
- {
- applyNodeToNode(findFirstNodeOnAttribute(CreateXMLDOC(xml), "type", "n", this.f_TypeName), findFirstNodeOnAttribute(this.nodeMetadata, "type", "n", this.f_TypeName), "n");
- }
+ applyNodeToNode(findFirstNodeOnAttribute(CreateXMLDOC(xml), "type", "n", this.f_TypeName), findFirstNodeOnAttribute(this.nodeMetadata, "type", "n", this.f_TypeName), "n");
}else
if(typeof(xml) == "object"){
if(xml.getAttribute("n")==this.f_TypeName)
@@ -165,7 +161,7 @@ class SRec
\
\
| \
- \
+ \
|
\
\
';
@@ -1101,7 +1097,7 @@ class SRec
this.masChBox=new Array(); //List of checkboxes
//Delete rows from the page table
- let tablepages=document.getElementById('pages'+this.uid);
+ let tablepages=document.getElementById('pages_'+this.uid);
for(let i = 0; i < tablepages.rows.length;)
{
tablepages.deleteRow(i);
@@ -1255,6 +1251,8 @@ class SRec
}
nodeRecord = nodeRecord.nextSibling;
}
+
+ this.updateSize();
}
//by the column number, return the reference to the column node (numbering from 0)
@@ -1520,7 +1518,25 @@ class SRec
//We run through the marked records and request their removal
deleteRecord(recordid)
{
- if (confirm(trt("Are_you_sure_you_want_to_delete_the_entries")+'?'))
+ confirm2(trt('Warning'),trt("Are_you_sure_you_want_to_delete_the_entries")+"
"
+ ,function(thiz){
+ return function(){
+
+ for(let i=0;i',true))
+ {
+ thiz.showProgressBar();
+ }
+ }
+ }
+ };
+ }(this)
+ ,null);
+
+ /*if (confirm(trt("Are_you_sure_you_want_to_delete_the_entries")+'?'))
{
for(let i=0;i\n\
\n\
| | \n\
- | \n\
+ | \n\
\ | \n\
\n\
';
diff --git a/metadata/include/tools.php b/metadata/include/tools.php
index 4c63e4c..f9b66e9 100644
--- a/metadata/include/tools.php
+++ b/metadata/include/tools.php
@@ -61,7 +61,7 @@ function trts($text)
$toTranslate=substr($text, $pos1+$pLen+1, $pos2 - $pos1 - $pLen-1 );
$result.=trt($toTranslate);
$cut=$pos2+2;
- $from = $pos2 + $pLen;
+ $from = $pos2;
}
}else break;
}