From d48940e3bd157ec6842ae26578d24355d2903c71 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 16 Jun 2023 13:13:42 +0800
Subject: [PATCH] * Change to modal.

---
 module/bug/ui/view.html.php      | 2 +-
 module/my/config/table.php       | 1 +
 module/my/js/audit.ui.js         | 2 +-
 module/testcase/ui/view.html.php | 6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/bug/ui/view.html.php b/module/bug/ui/view.html.php
index ed16692566..010875610e 100644
--- a/module/bug/ui/view.html.php
+++ b/module/bug/ui/view.html.php
@@ -298,7 +298,7 @@ detailBody
     )
 );
 
-render();
+render(isAjaxRequest('modal') ? 'modalDialog' : 'page');
 
 /**
  * Build content of table data.
diff --git a/module/my/config/table.php b/module/my/config/table.php
index 94a2a7bef4..8739b7842c 100644
--- a/module/my/config/table.php
+++ b/module/my/config/table.php
@@ -545,6 +545,7 @@ $config->my->audit->dtable->fieldList['title']['type']        = 'title';
 $config->my->audit->dtable->fieldList['title']['link']        = array('module' => 'story', 'method' => 'view', 'params' => 'id={id}');
 $config->my->audit->dtable->fieldList['title']['fixed']       = 'left';
 $config->my->audit->dtable->fieldList['title']['data-toggle'] = 'modal';
+$config->my->audit->dtable->fieldList['title']['data-size']   = '1200px';
 
 $config->my->audit->dtable->fieldList['type']['name']  = 'type';
 $config->my->audit->dtable->fieldList['type']['title'] = $lang->my->auditField->type;
diff --git a/module/my/js/audit.ui.js b/module/my/js/audit.ui.js
index b3bd60bdd5..a61aebec01 100644
--- a/module/my/js/audit.ui.js
+++ b/module/my/js/audit.ui.js
@@ -3,7 +3,7 @@ window.onRenderCell = function(result, {row, col})
     if(result && col.name == 'title')
     {
         result.pop();
-        result.push({html: '<a href=\'' + viewLink.replace('{module}', row.data.module).replace('{id}', row.data.id)  + '\'>'+ row.data.title + '</a>'});
+        result.push({html: '<a href=\'' + viewLink.replace('{module}', row.data.module).replace('{id}', row.data.id)  + '\' data-toggle="modal" data-size="1200px">'+ row.data.title + '</a>'});
     }
     return result;
 }
diff --git a/module/testcase/ui/view.html.php b/module/testcase/ui/view.html.php
index 81f9af00cd..96ba1515dc 100644
--- a/module/testcase/ui/view.html.php
+++ b/module/testcase/ui/view.html.php
@@ -12,7 +12,6 @@ namespace zin;
 
 $canCreateCase = hasPriv('testcase', 'create');
 
-
 $stepID = $childID = 0;
 $steps = array();
 foreach($case->steps as $step)
@@ -337,6 +336,7 @@ detailHeader
             set::text($case->title)
         )
     ),
+    $isInModal ? to::prefix('') : null,
     !$isInModal ? to::suffix
     (
         btn
@@ -416,10 +416,10 @@ detailBody
         (
             floatToolbar
             (
-                set::prefix
+                !$isInModal ? set::prefix
                 (
                     array(array('icon' => 'back', 'text' => $lang->goback))
-                ),
+                ) : null,
                 set::main($this->testcase->buildOperateMenu($case, 'view')),
                 set::suffix
                 (