Merge branch 'cyy_task' into 'master'

Cyy task

See merge request easycorp/zentaopms!7355
This commit is contained in:
王怡栋
2023-04-11 06:05:51 +00:00
11 changed files with 26 additions and 13 deletions
+1 -1
View File
@@ -55,7 +55,7 @@
}?>
<a id="hisTrigger" href="###" class="btn btn-link" title=<?php echo $lang->history?>><span class="icon icon-clock"></span></a>
<?php if($this->config->edition == 'max' and $this->app->tab == 'project'):?>
<?php if($config->vision == 'rnd' and $config->edition == 'max' and $app->tab == 'project'):?>
<?php
$canImportToPracticeLib = (common::hasPriv('doc', 'importToPracticeLib') and helper::hasFeature('practicelib'));
$canImportToComponentLib = (common::hasPriv('doc', 'importToComponentLib') and helper::hasFeature('componentlib'));