Merge branch 'master_xieqiyu_2442' into 'master'
* Fix bug#2442. See merge request easycorp/zentaopms!3070
This commit is contained in:
@@ -92,6 +92,9 @@ class datatable extends control
|
||||
{
|
||||
unset($cols['plan']);
|
||||
unset($cols['stage']);
|
||||
unset($cols['taskCount']);
|
||||
unset($cols['bugCount']);
|
||||
unset($cols['caseCount']);
|
||||
}
|
||||
|
||||
$this->view->cols = $cols;
|
||||
|
||||
@@ -313,7 +313,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
|
||||
{
|
||||
if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
|
||||
{
|
||||
if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage')))) $value->show = false;
|
||||
if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage', 'taskCount', 'bugCount', 'caseCount')))) $value->show = false;
|
||||
|
||||
if($value->show)
|
||||
{
|
||||
@@ -326,7 +326,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
|
||||
<?php
|
||||
foreach($setting as $key => $value)
|
||||
{
|
||||
if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage')))) $value->show = false;
|
||||
if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage', 'taskCount', 'bugCount', 'caseCount')))) $value->show = false;
|
||||
|
||||
if($value->show)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user