From efbbf0a69587bba4fa4d200a9da9584b8ff9e741 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Wed, 17 Mar 2021 10:34:29 +0800
Subject: [PATCH 1/2] * Finish task #36747.

---
 module/story/model.php          | 2 +-
 module/story/view/view.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index ece2ee9f33..75d0bcd81c 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3483,7 +3483,7 @@ class storyModel extends model
                     }
 
                     common::printIcon('story', 'change',     $vars . "&from=$story->from", $story, 'list', 'alter', '', '', false, "data-group=$story->from");
-                    common::printIcon('story', 'review',     $vars . "&from=$story->from", $story, 'list', 'glasses', '', '', false, "data-group=$story->from");
+                    common::printIcon('story', 'review',     $vars . "&from=$story->from", $story, 'list', 'search', '', '', false, "data-group=$story->from");
                     common::printIcon('story', 'close',      $vars, $story, 'list', '', '', 'iframe', true);
                     common::printIcon('story', 'edit',       $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from");
                     common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 638b236e07..26b5b1b312 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -164,7 +164,7 @@
                 <td class='c-actions'>
                   <?php
                   common::printIcon('story', 'change', "storyID=$child->id", $child, 'list', 'alter');
-                  common::printIcon('story', 'review', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
+                  common::printIcon('story', 'review', "storyID=$child->id", $child, 'list', 'search', '', 'iframe showinonlybody', true);
                   common::printIcon('story', 'assignTo', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
                   common::printIcon('story', 'close',  "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
                   common::printIcon('story', 'activate', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
@@ -189,7 +189,7 @@
         <?php if(!$story->deleted):?>
         <?php
         common::printIcon('story', 'change', "storyID=$story->id", $story, 'button', 'alter', '', 'showinonlybody');
-        common::printIcon('story', 'review', "storyID=$story->id", $story, 'button', '', '', 'showinonlybody');
+        common::printIcon('story', 'review', "storyID=$story->id", $story, 'button', 'search', '', 'showinonlybody');
         if($story->status == 'active' and $story->stage == 'wait' and $story->parent <= 0 and !isonlybody())
         {
             $divideLang = $lang->story->subdivide;

From 7dade3fa8f72faf3312416146c257220726ee205 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 17 Mar 2021 10:39:21 +0800
Subject: [PATCH 2/2] * Remove sql.

---
 db/update15.0.sql | 1 -
 db/zentao.sql     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/db/update15.0.sql b/db/update15.0.sql
index f3d4d00c13..1c0584c3b8 100644
--- a/db/update15.0.sql
+++ b/db/update15.0.sql
@@ -39,7 +39,6 @@ ALTER TABLE `zt_webhook` CHANGE `projects` `executions` mediumint(8) unsigned NO
 ALTER TABLE `zt_task` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
 ALTER TABLE `zt_doclib` ADD `project` mediumint(8) unsigned NOT NULL AFTER `product`;
 ALTER TABLE `zt_doc` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_story` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
 ALTER TABLE `zt_bug` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
 ALTER TABLE `zt_case` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
 ALTER TABLE `zt_testtask` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`;
diff --git a/db/zentao.sql b/db/zentao.sql
index 942b73b772..a20bee89ee 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -807,7 +807,6 @@ CREATE TABLE IF NOT EXISTS `zt_stakeholder` (
 -- DROP TABLE IF EXISTS `zt_story`;
 CREATE TABLE IF NOT EXISTS `zt_story` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
-  `project` mediumint(8) unsigned NOT NULL,
   `parent` mediumint(9) NOT NULL default '0',
   `product` mediumint(8) unsigned NOT NULL default '0',
   `branch` mediumint(8) unsigned NOT NULL default '0',