Правка выбора страницы в DBMS

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;

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");
-			}
 		}else
 		if(typeof(xml) == "object"){
 			if(xml.getAttribute("n")==this.f_TypeName)
@@ -165,7 +161,7 @@ class SRec
 						</table>\
 					</div>\
 			</td></tr><tr><td>\
-				<center><table id="pages'+this.uid+'"><tbody><tr><td>&nbsp;</td></tr></tbody></table></center>\
+				<center><table id="pages_'+this.uid+'"><tbody><tr><td>&nbsp;</td></tr></tbody></table></center>\
 			</td></tr></table>\
 			</div>\
 		';
@@ -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")+"<br>"
+			,function(thiz){
+					return function(){
+
+						for(let i=0;i<thiz.masChBox.length;i++)
+						{
+							if(thiz.masChBox[i].checked)
+							{
+								if(thiz.request.callServer(ScriptName,'<?xml version="1.0" encoding="utf-8"?><metadata fn="3"><type n="'+thiz.f_TypeName+'" id="'+thiz.masChBox[i].value+'"></type></metadata>',true))
+								{
+									thiz.showProgressBar();
+								}
+							}
+						}
+					};
+				}(this)
+			,null);
+		
+		/*if (confirm(trt("Are_you_sure_you_want_to_delete_the_entries")+'?'))
 		{
 			for(let i=0;i<this.masChBox.length;i++)
 			{
@@ -1532,7 +1548,7 @@ class SRec
 					}
 				}
 			}
-		}
+		}*/
 		return false;
 	}
 

metadata/dbms/tools.js

@@ -225,7 +225,7 @@ function confirm2(title,text,okFunc,cancelFunc)
 			</tr>\n\
 			<tr style="height: 10px;">\n\
 				<td style="width: 100%;">&nbsp;</td>\n\
-				<td><button class="button-secondary" id="'+win.uid+'_ok" style="width: 80px;">'+trt('OK')+'</button></td>\n\
+				<td><button class="button-secondary" id="'+win.uid+'_ok" style="width: 80px;">'+trt('Ok')+'</button></td>\n\
 				\<td><button class="button-secondary" id="'+win.uid+'_cancel" style="width: 80px;">'+trt('Cancel')+'</button></td>\n\
 			</tr>\n\
 		</table>';

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;
     }