From 95521e44a4cf04b09841de4287384d7e957932a7 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 9 Dec 2020 13:48:51 +0800 Subject: [PATCH 1/6] * Finish task #8613. --- module/common/lang/de.php | 25 ++++------- module/common/lang/en.php | 25 ++++------- module/common/lang/fr.php | 25 ++++------- module/common/lang/vi.php | 25 ++++------- module/common/lang/zh-cn.php | 25 ++++------- module/common/lang/zh-tw.php | 25 ++++------- module/custom/model.php | 42 +++++++++---------- .../custom/view/configurewaterfall.html.php | 11 ++--- module/my/view/story.html.php | 2 - module/product/control.php | 2 +- module/product/model.php | 7 +--- module/product/view/create.html.php | 2 - module/product/view/edit.html.php | 2 - module/program/view/prjcreate.html.php | 2 - module/program/view/prjedit.html.php | 2 - module/story/control.php | 2 +- module/story/lang/de.php | 13 +++--- module/story/lang/en.php | 13 +++--- module/story/lang/fr.php | 13 +++--- module/story/lang/vi.php | 13 +++--- module/story/lang/zh-cn.php | 13 +++--- module/story/model.php | 2 +- module/story/view/create.html.php | 2 +- module/story/view/view.html.php | 4 -- 24 files changed, 101 insertions(+), 196 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index d38a5472fe..5f9012a0e6 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -125,11 +125,8 @@ $lang->common = new stdclass(); $lang->common->common = 'Standard Module'; global $config; -if($config->URAndSR) -{ - $URCommon = zget($lang, 'URCommon', "UR"); - $SRCommon = zget($lang, 'SRCommon', "SR"); -} +$URCommon = zget($lang, 'URCommon', "UR"); +$SRCommon = zget($lang, 'SRCommon', "SR"); /* Main menu. */ $lang->mainNav = new stdclass(); @@ -169,9 +166,9 @@ $lang->product->menu->home = 'Home|product|index|'; $lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit'); $lang->product->viewMenu = new stdclass(); -if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->viewMenu->story = array('link' => "$lang->productSRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -if($config->URAndSR) $lang->product->viewMenu->track = array('link' => "Track|story|track|productID=%s"); +$lang->product->viewMenu->track = array('link' => "Track|story|track|productID=%s"); $lang->product->viewMenu->plan = array('link' => "Plan|productplan|browse|productID=%s", 'subModule' => 'productplan'); $lang->product->viewMenu->release = array('link' => "Release|release|browse|productID=%s", 'subModule' => 'release'); $lang->product->viewMenu->roadmap = 'Roadmap|product|roadmap|productID=%s'; @@ -302,11 +299,8 @@ $lang->scrumproduct->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->scrumproduct->menu->module = 'Modul|tree|browse|productID=%s&view=story'; $lang->scrumproduct->menu->view = array('link' => 'Übersicht|product|view|productID=%s', 'alias' => 'edit'); -if(!empty($config->URAndSR)) -{ - $lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); - $lang->product->menu->story = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -} +$lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->menu->story = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->dividerMenu = ',project,doc,'; @@ -956,11 +950,8 @@ $lang->waterfallproduct->menu->plan = array('link' => "{$lang->planCommon}|prod $lang->waterfallproduct->menu->story = 'Story|product|browse|product={PRODUCT}'; $lang->waterfallproduct->menu->track = 'Track|story|track|product={PRODUCT}'; -if($config->URAndSR) -{ - $lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); - $lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); -} +$lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); +$lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search'); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index b93883f593..daf4f79f51 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -125,11 +125,8 @@ $lang->common = new stdclass(); $lang->common->common = 'Common Module'; global $config; -if($config->URAndSR) -{ - $URCommon = zget($lang, 'URCommon', "UR"); - $SRCommon = zget($lang, 'SRCommon', "SR"); -} +$URCommon = zget($lang, 'URCommon', "UR"); +$SRCommon = zget($lang, 'SRCommon', "SR"); /* Main menu. */ $lang->mainNav = new stdclass(); @@ -169,9 +166,9 @@ $lang->product->menu->home = 'Home|product|index|'; $lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit'); $lang->product->viewMenu = new stdclass(); -if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->viewMenu->story = array('link' => "$lang->productSRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -if($config->URAndSR) $lang->product->viewMenu->track = array('link' => "Track|story|track|productID=%s"); +$lang->product->viewMenu->track = array('link' => "Track|story|track|productID=%s"); $lang->product->viewMenu->plan = array('link' => "Plan|productplan|browse|productID=%s", 'subModule' => 'productplan'); $lang->product->viewMenu->release = array('link' => "Release|release|browse|productID=%s", 'subModule' => 'release'); $lang->product->viewMenu->roadmap = 'Roadmap|product|roadmap|productID=%s'; @@ -302,11 +299,8 @@ $lang->scrumproduct->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->scrumproduct->menu->module = 'Module|tree|browse|productID=%s&view=story'; $lang->scrumproduct->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); -if($config->URAndSR) -{ - $lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); - $lang->product->menu->story = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -} +$lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->menu->story = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->dividerMenu = ',project,doc,'; @@ -956,11 +950,8 @@ $lang->waterfallproduct->menu->plan = array('link' => "{$lang->planCommon}|prod $lang->waterfallproduct->menu->story = 'Story|product|browse|product={PRODUCT}'; $lang->waterfallproduct->menu->track = 'Track|story|track|product={PRODUCT}'; -if($config->URAndSR) -{ - $lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); - $lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); -} +$lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); +$lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search'); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 53c7f6cc4f..2f2dfe42d7 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -125,11 +125,8 @@ $lang->common = new stdclass(); $lang->common->common = 'Module Commun'; global $config; -if($config->URAndSR) -{ - $URCommon = zget($lang, 'URCommon', "UR"); - $SRCommon = zget($lang, 'SRCommon', "SR"); -} +$URCommon = zget($lang, 'URCommon', "UR"); +$SRCommon = zget($lang, 'SRCommon', "SR"); /* Main menu. */ $lang->mainNav = new stdclass(); @@ -169,9 +166,9 @@ $lang->product->menu->home = 'Home|product|index|'; $lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit'); $lang->product->viewMenu = new stdclass(); -if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->viewMenu->story = array('link' => "$lang->productSRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -if($config->URAndSR) $lang->product->viewMenu->track = array('link' => "Track|story|track|productID=%s"); +$lang->product->viewMenu->track = array('link' => "Track|story|track|productID=%s"); $lang->product->viewMenu->plan = array('link' => "Plan|productplan|browse|productID=%s", 'subModule' => 'productplan'); $lang->product->viewMenu->release = array('link' => "Release|release|browse|productID=%s", 'subModule' => 'release'); $lang->product->viewMenu->roadmap = 'Roadmap|product|roadmap|productID=%s'; @@ -302,11 +299,8 @@ $lang->scrumproduct->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->scrumproduct->menu->module = 'Module|tree|browse|productID=%s&view=story'; $lang->scrumproduct->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); -if($config->URAndSR) -{ - $lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); - $lang->product->menu->story = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -} +$lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->menu->story = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->dividerMenu = ',project,doc,'; @@ -956,11 +950,8 @@ $lang->waterfallproduct->menu->plan = array('link' => "{$lang->planCommon}|prod $lang->waterfallproduct->menu->story = 'Story|product|browse|product={PRODUCT}'; $lang->waterfallproduct->menu->track = 'Track|story|track|product={PRODUCT}'; -if($config->URAndSR) -{ - $lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); - $lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); -} +$lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); +$lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search'); diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index b2ce5b074d..fe0580dd35 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -125,11 +125,8 @@ $lang->common = new stdclass(); $lang->common->common = 'Module chung'; global $config; -if($config->URAndSR) -{ - $URCommon = zget($lang, 'URCommon', "UR"); - $SRCommon = zget($lang, 'SRCommon', "SR"); -} +$URCommon = zget($lang, 'URCommon', "UR"); +$SRCommon = zget($lang, 'SRCommon', "SR"); /* Main menu. */ $lang->mainNav = new stdclass(); @@ -169,9 +166,9 @@ $lang->product->menu->home = 'Home|product|index|'; $lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit'); $lang->product->viewMenu = new stdclass(); -if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->viewMenu->story = array('link' => "$lang->productSRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -if($config->URAndSR) $lang->product->viewMenu->track = array('link' => "Track|story|track|productID=%s"); +$lang->product->viewMenu->track = array('link' => "Track|story|track|productID=%s"); $lang->product->viewMenu->plan = array('link' => "Plan|productplan|browse|productID=%s", 'subModule' => 'productplan'); $lang->product->viewMenu->release = array('link' => "Release|release|browse|productID=%s", 'subModule' => 'release'); $lang->product->viewMenu->roadmap = 'Roadmap|product|roadmap|productID=%s'; @@ -302,11 +299,8 @@ $lang->scrumproduct->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->scrumproduct->menu->module = 'Module|tree|browse|productID=%s&view=story'; $lang->scrumproduct->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); -if($config->URAndSR) -{ - $lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); - $lang->product->menu->story = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -} +$lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->menu->story = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->dividerMenu = ',project,doc,'; @@ -956,11 +950,8 @@ $lang->waterfallproduct->menu->plan = array('link' => "{$lang->planCommon}|prod $lang->waterfallproduct->menu->story = 'Story|product|browse|product={PRODUCT}'; $lang->waterfallproduct->menu->track = 'Track|story|track|product={PRODUCT}'; -if($config->URAndSR) -{ - $lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); - $lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); -} +$lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); +$lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index d49a8f54e4..8e1659b8c7 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -125,11 +125,8 @@ $lang->common = new stdclass(); $lang->common->common = '公有模块'; global $config; -if($config->URAndSR) -{ - $URCommon = zget($lang, 'URCommon', "用户需求"); - $SRCommon = zget($lang, 'SRCommon', "软件需求"); -} +$URCommon = zget($lang, 'URCommon', "用户需求"); +$SRCommon = zget($lang, 'SRCommon', "软件需求"); /* 主导航菜单。*/ $lang->mainNav = new stdclass(); @@ -169,9 +166,9 @@ $lang->product->menu->home = '主页|product|index|'; $lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit'); $lang->product->viewMenu = new stdclass(); -if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->viewMenu->story = array('link' => "$lang->productSRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -if($config->URAndSR) $lang->product->viewMenu->track = array('link' => "跟踪矩阵|story|track|productID=%s"); +$lang->product->viewMenu->track = array('link' => "跟踪矩阵|story|track|productID=%s"); $lang->product->viewMenu->plan = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan'); $lang->product->viewMenu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->viewMenu->roadmap = '路线图|product|roadmap|productID=%s'; @@ -302,11 +299,8 @@ $lang->scrumproduct->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->scrumproduct->menu->module = '模块|tree|browse|productID=%s&view=story'; $lang->scrumproduct->menu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit'); -if($config->URAndSR) -{ - $lang->scrumproduct->menu->requirement = array('link' => "{$lang->projectURCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); - $lang->scrumproduct->menu->story = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -} +$lang->scrumproduct->menu->requirement = array('link' => "{$lang->projectURCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->scrumproduct->menu->story = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->dividerMenu = ',project,doc,'; @@ -956,11 +950,8 @@ $lang->waterfallproduct->menu->plan = array('link' => "{$lang->planCommon}|prod $lang->waterfallproduct->menu->story = '需求|product|browse|product={PRODUCT}'; $lang->waterfallproduct->menu->track = '跟踪矩阵|story|track|product={PRODUCT}'; -if($config->URAndSR) -{ - $lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); - $lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); -} +$lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); +$lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search'); diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index cc909eea77..c49f062315 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -125,11 +125,8 @@ $lang->common = new stdclass(); $lang->common->common = '公有模組'; global $config; -if($config->URAndSR) -{ - $URCommon = zget($lang, 'URCommon', "用戶需求"); - $SRCommon = zget($lang, 'SRCommon', "軟件需求"); -} +$URCommon = zget($lang, 'URCommon', "用戶需求"); +$SRCommon = zget($lang, 'SRCommon', "軟件需求"); /* 主導航菜單。*/ $lang->mainNav = new stdclass(); @@ -169,9 +166,9 @@ $lang->product->menu->home = '主頁|product|index|'; $lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit'); $lang->product->viewMenu = new stdclass(); -if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->viewMenu->story = array('link' => "$lang->productSRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -if($config->URAndSR) $lang->product->viewMenu->track = array('link' => "跟蹤矩陣|story|track|productID=%s"); +$lang->product->viewMenu->track = array('link' => "跟蹤矩陣|story|track|productID=%s"); $lang->product->viewMenu->plan = array('link' => "計劃|productplan|browse|productID=%s", 'subModule' => 'productplan'); $lang->product->viewMenu->release = array('link' => '發佈|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->viewMenu->roadmap = '路線圖|product|roadmap|productID=%s'; @@ -302,11 +299,8 @@ $lang->scrumproduct->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->scrumproduct->menu->module = '模組|tree|browse|productID=%s&view=story'; $lang->scrumproduct->menu->view = array('link' => '概況|product|view|productID=%s', 'alias' => 'edit'); -if($config->URAndSR) -{ - $lang->scrumproduct->menu->requirement = array('link' => "{$lang->projectURCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); - $lang->scrumproduct->menu->story = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -} +$lang->scrumproduct->menu->requirement = array('link' => "{$lang->projectURCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->scrumproduct->menu->story = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->dividerMenu = ',project,doc,'; @@ -956,11 +950,8 @@ $lang->waterfallproduct->menu->plan = array('link' => "{$lang->planCommon}|prod $lang->waterfallproduct->menu->story = '需求|product|browse|product={PRODUCT}'; $lang->waterfallproduct->menu->track = '跟蹤矩陣|story|track|product={PRODUCT}'; -if($config->URAndSR) -{ - $lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); - $lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); -} +$lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed¶m=0&storyType=requirement"); +$lang->waterfallproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}"); $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search'); diff --git a/module/custom/model.php b/module/custom/model.php index 5eabf7e608..a7147dd0d1 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -594,35 +594,31 @@ class customModel extends model $data = fixer::input('post')->get(); $lang = $this->app->getClientLang(); - $this->loadModel('setting')->setItem("system.custom.URAndSR", $data->URAndSR); - if($data->URAndSR) + /* If has custom UR and SR name. */ + $newKey = ''; + if(isset($data->URSRCustom)) { - /* If has custom UR and SR name. */ - $newKey = ''; - if(isset($data->URSRCustom)) - { - if(!$data->URName || !$data->SRName) return false; + if(!$data->URName || !$data->SRName) return false; - $newKey = max(array_keys($this->lang->custom->URSRList)) + 1; - $URSRName = $data->URName . '/' . $data->SRName; + $newKey = max(array_keys($this->lang->custom->URSRList)) + 1; + $URSRName = $data->URName . '/' . $data->SRName; - /* Delete old lang data, and add new. */ - $this->lang->custom->URSRList[$newKey] = $URSRName; - $this->lang->custom->URList[$newKey] = $data->URName; - $this->lang->custom->SRList[$newKey] = $data->SRName; - $this->deleteItems("lang=$lang&module=custom§ion=URSRList"); - $this->deleteItems("lang=$lang&module=custom§ion=URList"); - $this->deleteItems("lang=$lang&module=custom§ion=SRList"); + /* Delete old lang data, and add new. */ + $this->lang->custom->URSRList[$newKey] = $URSRName; + $this->lang->custom->URList[$newKey] = $data->URName; + $this->lang->custom->SRList[$newKey] = $data->SRName; + $this->deleteItems("lang=$lang&module=custom§ion=URSRList"); + $this->deleteItems("lang=$lang&module=custom§ion=URList"); + $this->deleteItems("lang=$lang&module=custom§ion=SRList"); - foreach($this->lang->custom->URSRList as $key => $value) $this->setItem("$lang.custom.URSRList.{$key}.1", $value); - foreach($this->lang->custom->URList as $key => $value) $this->setItem("$lang.custom.URList.{$key}.1", $value); - foreach($this->lang->custom->SRList as $key => $value) $this->setItem("$lang.custom.SRList.{$key}.1", $value); - } - - $URSRName = $newKey ? $newKey : $data->URSRCommon; - $this->setting->setItem("system.custom.URSRName", $URSRName); + foreach($this->lang->custom->URSRList as $key => $value) $this->setItem("$lang.custom.URSRList.{$key}.1", $value); + foreach($this->lang->custom->URList as $key => $value) $this->setItem("$lang.custom.URList.{$key}.1", $value); + foreach($this->lang->custom->SRList as $key => $value) $this->setItem("$lang.custom.SRList.{$key}.1", $value); } + $URSRName = $newKey ? $newKey : $data->URSRCommon; + $this->loadModel('setting')->setItem("system.custom.URSRName", $URSRName); + return true; } diff --git a/module/custom/view/configurewaterfall.html.php b/module/custom/view/configurewaterfall.html.php index 284a33829c..c6ee935fbe 100644 --- a/module/custom/view/configurewaterfall.html.php +++ b/module/custom/view/configurewaterfall.html.php @@ -20,16 +20,11 @@
- - - - - - config->custom, 'URAndSR', 0) == 0 ? 'hidden' : '';?> - - + + + diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 3e41570678..0b4ee09154 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -21,9 +21,7 @@ diff --git a/module/product/control.php b/module/product/control.php index a12dd2a99b..7916a53835 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -194,7 +194,7 @@ class product extends control $storyCases = $this->loadModel('testcase')->getStoryCaseCounts($storyIdList); /* Change for requirement story title. */ - if($storyType == 'requirement' and $this->config->URAndSR) + if($storyType == 'requirement') { $this->lang->story->title = str_replace($this->lang->productSRCommon, $this->lang->productURCommon, $this->lang->story->title); $this->config->product->search['fields']['title'] = $this->lang->story->title; diff --git a/module/product/model.php b/module/product/model.php index 080fed6586..3810c11f7a 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1239,11 +1239,8 @@ class productModel extends model $rate = count($stories) == 0 || $rateCount == 0 ? 0 : round(count($cases) / $rateCount, 2); $storyCommon = $this->lang->productSRCommon; - if($this->config->URAndSR) - { - if($storyType == 'requirement') $storyCommon = $this->lang->productURCommon; - if($storyType == 'story') $storyCommon = $this->lang->productSRCommon; - } + if($storyType == 'requirement') $storyCommon = $this->lang->productURCommon; + if($storyType == 'story') $storyCommon = $this->lang->productSRCommon; return sprintf($this->lang->product->storySummary, $allCount, $storyCommon, $totalEstimate, $rate * 100 . "%"); } diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index 06393df12a..19df3f53bb 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -55,13 +55,11 @@ - URAndSR):?> - diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index fbbe2b17cb..72ed7b44cb 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -55,13 +55,11 @@ - URAndSR):?> - diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php index 15b040e72c..f792761d34 100644 --- a/module/program/view/prjcreate.html.php +++ b/module/program/view/prjcreate.html.php @@ -131,14 +131,12 @@ printExtendFields('', 'table');?> - URAndSR):?> - - URAndSR):?> - - URAndSR and $type == 'story'):?> + diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index c1726426bd..6181b89a35 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -389,17 +389,14 @@
- URAndSR):?>
    story->unlink . $linkLang, '', "class='btn btn-info' id='unlinkStory'");?>
-
    Date: Wed, 9 Dec 2020 13:53:10 +0800 Subject: [PATCH 2/6] * Finish task #8581. --- module/common/lang/de.php | 2 ++ module/common/lang/en.php | 2 ++ module/common/lang/fr.php | 2 ++ module/common/lang/menuOrder.php | 1 + module/common/lang/vi.php | 2 ++ module/common/lang/zh-cn.php | 2 ++ 6 files changed, 11 insertions(+) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 5f9012a0e6..4ba1edcda5 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -278,6 +278,8 @@ $lang->my->menu->testtask = array('link' => 'Test Aufgaben|my|testtask|', 'su $lang->my->menu->story = array('link' => 'Story|my|story|', 'subModule' => 'story'); $lang->my->menu->myExecution = "Execution|my|execution|"; $lang->my->menu->dynamic = 'Verlauf|my|dynamic|'; +$lang->my->menu->profile = 'Profile|my|profile|'; +$lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->dividerMenu = ',program,requirement,dynamic,'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index daf4f79f51..266880e971 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -278,6 +278,8 @@ $lang->my->menu->testtask = array('link' => 'Request|my|testtask|', 'subModul $lang->my->menu->story = array('link' => 'Story|my|story|', 'subModule' => 'story'); $lang->my->menu->myExecution = "Execution|my|execution|"; $lang->my->menu->dynamic = 'Dynamics|my|dynamic|'; +$lang->my->menu->profile = 'Profile|my|profile|'; +$lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->dividerMenu = ',program,requirement,dynamic,'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 2f2dfe42d7..85c4f426cc 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -278,6 +278,8 @@ $lang->my->menu->testtask = array('link' => 'Recette|my|testtask|', 'subModul $lang->my->menu->story = array('link' => 'Story|my|story|', 'subModule' => 'story'); $lang->my->menu->myExecution = "Execution|my|execution|"; $lang->my->menu->dynamic = 'Historique|my|dynamic|'; +$lang->my->menu->profile = 'Profile|my|profile|'; +$lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->dividerMenu = ',program,requirement,dynamic,'; diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 52a008ed41..d60b29a0a0 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -49,6 +49,7 @@ $lang->my->menuOrder[60] = 'dynamic'; $lang->my->menuOrder[65] = 'profile'; $lang->my->menuOrder[70] = 'changePassword'; $lang->my->menuOrder[75] = 'score'; +$lang->my->menuOrder[80] = 'contacts'; $lang->todo->menuOrder = $lang->my->menuOrder; /* product menu order. */ diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index fe0580dd35..2b63c6dc87 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -278,6 +278,8 @@ $lang->my->menu->testtask = array('link' => 'Yêu cầu|my|testtask|', 'subMo $lang->my->menu->story = array('link' => 'Câu chuyện|my|story|', 'subModule' => 'story'); $lang->my->menu->myExecution = "Execution|my|execution|"; $lang->my->menu->dynamic = 'Lịch sử|my|dynamic|'; +$lang->my->menu->profile = 'Profile|my|profile|'; +$lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->dividerMenu = ',program,requirement,dynamic,'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 8e1659b8c7..d5c6b2bf1c 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -278,6 +278,8 @@ $lang->my->menu->testtask = array('link' => '测试|my|testtask|', 'subModule $lang->my->menu->story = array('link' => "需求|my|story|", 'subModule' => 'story'); $lang->my->menu->myExecution = "{$lang->executionCommon}|my|execution|"; $lang->my->menu->dynamic = '动态|my|dynamic|'; +$lang->my->menu->profile = '档案|my|profile|'; +$lang->my->menu->contacts = '联系人|my|managecontacts|'; $lang->my->dividerMenu = ',program,requirement,dynamic,'; From 65ba8b4e768fbe19c081abf8d6798c860d46516f Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 9 Dec 2020 14:07:49 +0800 Subject: [PATCH 3/6] * Finish task #8675. --- module/block/view/programteamblock.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/block/view/programteamblock.html.php b/module/block/view/programteamblock.html.php index e885433b5b..5b61053262 100644 --- a/module/block/view/programteamblock.html.php +++ b/module/block/view/programteamblock.html.php @@ -8,6 +8,7 @@ $maxConsumed = 0;
    +
    program->PRJName;?>
    teamCount); @@ -47,7 +48,7 @@ $maxConsumed = 0;
custom->waterfall->URAndSR;?> custom->waterfallOptions->URAndSR, zget($this->config->custom, 'URAndSR', '0'));?>
custom->waterfall->URSRName;?>
custom->waterfall->URSRName;?> custom->URSRList, zget($config->custom, 'URSRName', 1), "class='form-control chosen'");?> custom->common, "class='form-control'");?>
product->storyConcept;?> custom->URSRList, zget($config->custom, 'URSRName', 1), "class='form-control chosen'");?>
product->status;?> product->type;?> product->typeList, $product->type, "class='form-control'");?>
product->storyConcept;?> custom->URSRList, $product->storyConcept, "class='form-control chosen'");?>
product->status;?> product->statusList, $product->status, "class='form-control'");?>
program->PRJStoryConcept;?> custom->URSRList, zget($config->custom, 'URSRName', 1), "class='form-control chosen'");?>
program->PRJDesc;?> diff --git a/module/program/view/prjedit.html.php b/module/program/view/prjedit.html.php index f1802bac58..4069a59024 100644 --- a/module/program/view/prjedit.html.php +++ b/module/program/view/prjedit.html.php @@ -131,14 +131,12 @@
program->PRJStoryConcept;?> custom->URSRList, $project->storyConcept, "class='form-control chosen'");?>
program->PRJDesc;?> diff --git a/module/story/control.php b/module/story/control.php index d7f60a42a6..1c80336b40 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -472,7 +472,7 @@ class story extends control */ public function replaceURLang($type) { - if($type == 'requirement' and $this->config->URAndSR) + if($type == 'requirement') { $storyLang = $this->lang->story; $SRCommon = $this->lang->productSRCommon; diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 7fe637b735..9b5c388cd4 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -14,14 +14,11 @@ $lang->story->create = "Story hinzufügen"; $lang->story->createStory = "Story hinzufügen"; $lang->story->createRequirement = 'Create Requirement'; -if(!empty($config->URAndSR)) -{ - $lang->story->requirement = zget($lang, 'urCommon', "Requirement"); - $lang->story->story = zget($lang, 'srCommon', "Story"); - $lang->story->createStory = 'Create ' . $lang->story->story; - $lang->story->createRequirement = 'Create ' . $lang->story->requirement; - $lang->story->affectedStories = "Affected {$lang->story->story}"; -} +$lang->story->requirement = zget($lang, 'urCommon', "Requirement"); +$lang->story->story = zget($lang, 'srCommon', "Story"); +$lang->story->createStory = 'Create ' . $lang->story->story; +$lang->story->createRequirement = 'Create ' . $lang->story->requirement; +$lang->story->affectedStories = "Affected {$lang->story->story}"; $lang->story->batchCreate = "Mehere hinzufügen"; $lang->story->change = "Ändern"; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 2b541c1bdc..6fb2b3146d 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -14,14 +14,11 @@ $lang->story->create = "Create Story"; $lang->story->createStory = 'Create Story'; $lang->story->createRequirement = 'Create Requirement'; -if($config->URAndSR) -{ - $lang->story->requirement = zget($lang, 'URCommon', "Requirement"); - $lang->story->story = zget($lang, 'SRCommon', "Story"); - $lang->story->createStory = 'Create ' . $lang->story->story; - $lang->story->createRequirement = 'Create ' . $lang->story->requirement; - $lang->story->affectedStories = "Affected {$lang->story->story}"; -} +$lang->story->requirement = zget($lang, 'URCommon', "Requirement"); +$lang->story->story = zget($lang, 'SRCommon', "Story"); +$lang->story->createStory = 'Create ' . $lang->story->story; +$lang->story->createRequirement = 'Create ' . $lang->story->requirement; +$lang->story->affectedStories = "Affected {$lang->story->story}"; $lang->story->batchCreate = "Batch Create"; $lang->story->change = "Change"; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 9b1175359a..99edd1f89b 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -14,14 +14,11 @@ $lang->story->create = "Créer Story"; $lang->story->createStory = "Créer Story"; $lang->story->createRequirement = 'Create Requirement'; -if(!empty($config->URAndSR)) -{ - $lang->story->requirement = zget($lang, 'urCommon', "Requirement"); - $lang->story->story = zget($lang, 'srCommon', "Story"); - $lang->story->createStory = 'Create ' . $lang->story->story; - $lang->story->createRequirement = 'Create ' . $lang->story->requirement; - $lang->story->affectedStories = "Affected {$lang->story->story}"; -} +$lang->story->requirement = zget($lang, 'urCommon', "Requirement"); +$lang->story->story = zget($lang, 'srCommon', "Story"); +$lang->story->createStory = 'Create ' . $lang->story->story; +$lang->story->createRequirement = 'Create ' . $lang->story->requirement; +$lang->story->affectedStories = "Affected {$lang->story->story}"; $lang->story->batchCreate = "Créer par Lot"; $lang->story->change = "Changer"; diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php index e637e6dc02..bf8ecdb4c9 100644 --- a/module/story/lang/vi.php +++ b/module/story/lang/vi.php @@ -14,14 +14,11 @@ $lang->story->create = "Create Story"; $lang->story->createStory = 'Create Story'; $lang->story->createRequirement = 'Create Requirement'; -if(!empty($config->URAndSR)) -{ - $lang->story->requirement = zget($lang, 'urCommon', "Requirement"); - $lang->story->story = zget($lang, 'srCommon', "Story"); - $lang->story->createStory = 'Create ' . $lang->story->story; - $lang->story->createRequirement = 'Create ' . $lang->story->requirement; - $lang->story->affectedStories = "Affected {$lang->story->story}"; -} +$lang->story->requirement = zget($lang, 'urCommon', "Requirement"); +$lang->story->story = zget($lang, 'srCommon', "Story"); +$lang->story->createStory = 'Create ' . $lang->story->story; +$lang->story->createRequirement = 'Create ' . $lang->story->requirement; +$lang->story->affectedStories = "Affected {$lang->story->story}"; $lang->story->batchCreate = "Tạo hàng loạt"; $lang->story->change = "Thay đổi"; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 1616a285ef..4e47886896 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -14,14 +14,11 @@ $lang->story->create = "提{$lang->productSRCommon}"; $lang->story->createStory = "提{$lang->productSRCommon}"; $lang->story->createRequirement = "提{$lang->productSRCommon}"; -if($config->URAndSR) -{ - $lang->story->requirement = zget($lang, 'productURCommon', "用户需求"); - $lang->story->story = zget($lang, 'productSRCommon', "软件需求"); - $lang->story->createStory = '添加' . $lang->story->story; - $lang->story->createRequirement = '添加' . $lang->story->requirement; - $lang->story->affectedStories = "影响的{$lang->story->story}"; -} +$lang->story->requirement = zget($lang, 'productURCommon', "用户需求"); +$lang->story->story = zget($lang, 'productSRCommon', "软件需求"); +$lang->story->createStory = '添加' . $lang->story->story; +$lang->story->createRequirement = '添加' . $lang->story->requirement; +$lang->story->affectedStories = "影响的{$lang->story->story}"; $lang->story->batchCreate = "批量创建"; $lang->story->change = "变更"; diff --git a/module/story/model.php b/module/story/model.php index 9757e85329..730912166d 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3168,7 +3168,7 @@ class storyModel extends model ->fetchPairs('id', 'title'); /* For requirement children. */ - if($type == 'requirement' && $this->config->URAndSR) + if($type == 'requirement') { $relations = $this->dao->select('DISTINCT AID, BID')->from(TABLE_RELATION) ->where('AID')->in(array_keys($stories)) diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index fbc0637df2..3153d19af2 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -122,7 +122,7 @@
story->requirement;?>