version 4.10.56.1

totumonline · Aug 31, 2023 · 1d6ba92 · 1d6ba92
2 parents 5b9f6e2 + 85f99b0
commit 1d6ba92
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 12 deletions.
diff --git a/http/html.html b/http/html.html
@@ -6,12 +6,12 @@
           type="text/css"
           href="/css/libs.css?v=ead40ab">
     <script src="/js/libs.js?v=665342a"></script>
-    <script src="/js/functions.js?v=67bc3ca"></script>
+    <script src="/js/functions.js?v=4718f08"></script>
 
     <link rel="stylesheet"
           type="text/css"
           href="/css/main.css?v=7f3689c">
-    <script src="/js/main.js?v=b263331"></script>
+    <script src="/js/main.js?v=7870ff1"></script>
 
     </head>
 <body id="pk">

diff --git a/http/js/functions.js b/http/js/functions.js
diff --git a/http/js/main.js b/http/js/main.js
diff --git a/totum/common/Totum.php b/totum/common/Totum.php
@@ -27,7 +27,7 @@
  */
 class Totum
 {
-    public const VERSION = '4.10.56.0';
+    public const VERSION = '4.10.56.1';
 
 
     public const TABLE_CODE_PARAMS = ['row_format', 'table_format', 'on_duplicate', 'default_action'];

diff --git a/totum/common/calculates/CalculateAction.php b/totum/common/calculates/CalculateAction.php
@@ -948,6 +948,8 @@ protected function funcLinkToPanel($params)
                     $hash = $params['hash'];
                 } elseif ($this->Table->getTableRow()['id'] === $tableRow['id']) {
                     $hash = $this->Table->getTableRow()['sess_hash'];
+                }else{
+                    $this->__checkNotEmptyParams($params, ['hash']);
                 }
                 if (!empty($hash)) {
                     $link .= '?sess_hash=' . $hash;

diff --git a/totum/common/calculates/FuncServicesTrait.php b/totum/common/calculates/FuncServicesTrait.php
@@ -212,7 +212,7 @@ protected function generateByTemplate($params, $serviceName, $extention)
 
         $this->__checkNotEmptyParams($params, ['template']);
         $this->__checkNotArrayParams($params, ['comment']);
-        $this->__checkListParam($params, ['data']);
+        $this->__checkListParam($params, ['data', 'titles']);
 
         if (is_array($params['template']) && key_exists(0, $params['data'])) {
             if (count($params['template']) != count($params['data'])) {
@@ -234,6 +234,11 @@ protected function generateByTemplate($params, $serviceName, $extention)
 
         $Config = $this->Table->getTotum()->getConfig();
 
+        if ($isTitles = !empty($params['titles'])) {
+            $isMenyTitles = is_array($params['titles'][0] ?? null);
+        }
+
+
         $preparedData = [];
         foreach ($templates as $i => $template) {
             $pdf = $params['pdf'] ?? false;
@@ -242,9 +247,22 @@ protected function generateByTemplate($params, $serviceName, $extention)
                 'true', true => true,
                 default => is_array($_pdf) ? $_pdf : false
             };
+            $titles = [];
+            if ($template === '*NEW*' && $isTitles) {
+                foreach ($isMenyTitles ? ($params['titles'][$i] ?? []) : $params['titles'] as $title) {
+                    if (is_array($title)) {
+                        $title = json_encode($title, true);
+                    }
+                    $titles[] = $title;
+                }
+                if ($titles) {
+                    $titles = [$titles];
+                }
+            }
+
             $preparedData[] = [
                 'template' => $template === '*NEW*' ? '*NEW*' : base64_encode(File::getContent($template, $Config)),
-                'data' => $datas[$i],
+                'data' => array_merge($titles, $datas[$i]),
                 'pdf' => $_pdf,
             ];
         }

diff --git a/totum/moduls/Table/AdminTableActions.php b/totum/moduls/Table/AdminTableActions.php
@@ -120,6 +120,14 @@ public function bugFinder()
         die(json_encode(['ok' => 1, 'fields' => $fields, 'tableId' => $this->Table->getTableRow()['id']], JSON_UNESCAPED_UNICODE));
     }
 
+    public function delete()
+    {
+        if (!empty($this->post['force']) && $this->post['force']==='true') {
+            $this->Table->setDeleteForce();
+        }
+       return parent::delete();
+    }
+
     public function getAllTables()
     {
         $tables = [];

diff --git a/totum/moduls/install/start.json.gz.ttm b/totum/moduls/install/start.json.gz.ttm
diff --git a/totum/templates/html.html b/totum/templates/html.html
@@ -6,12 +6,12 @@
           type="text/css"
           href="/css/libs.css?v=ead40ab">
     <script src="/js/libs.js?v=665342a"></script>
-    <script src="/js/functions.js?v=67bc3ca"></script>
+    <script src="/js/functions.js?v=4718f08"></script>
 
     <link rel="stylesheet"
           type="text/css"
           href="/css/main.css?v=7f3689c">
-    <script src="/js/main.js?v=b263331"></script>
+    <script src="/js/main.js?v=7870ff1"></script>
 
     </head>
 <body id="pk">

diff --git a/totum/templates/page_template.php b/totum/templates/page_template.php
@@ -11,14 +11,14 @@
 
     <?php
     if ($isCreatorView ?? null) { ?>
-        <script src="/js/functions.js?v=67bc3ca"></script>
+        <script src="/js/functions.js?v=4718f08"></script>
         <?php
         echo '<script>App.functions=App.functions.concat(' . $this->Config->getExtFunctionsTemplates() . ')</script>';
         ?>
         <?php
     } ?>
 
-    <script src="/js/main.js?v=b263331"></script>
+    <script src="/js/main.js?v=7870ff1"></script>
     <script src="/js/i18n/<?= $this->Config->getLang() ?>.js?9"></script>
     <script>App.lang = App.langs["<?= $this->Config->getLang() ?>"]</script>
 

diff --git a/totum/templates/page_template_simple.php b/totum/templates/page_template_simple.php
@@ -8,7 +8,7 @@
     <link rel="stylesheet"
           type="text/css"
           href="/css/main.css?v=7f3689c">
-    <script src="/js/main.js?v=b263331"></script>
+    <script src="/js/main.js?v=7870ff1"></script>
     <script src="/js/i18n/<?= $this->Config->getLang() ?>.js?9"></script>
     <script>App.lang = App.langs["<?= $this->Config->getLang() ?>"]</script>