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', 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=¶m=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 @@ 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 @@ deleted):?> 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;