Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

* fix bug #18722#19905#21424

See merge request easycorp/zentaopms!2708
This commit is contained in:
王怡栋
2022-04-02 02:59:57 +00:00
4 changed files with 19 additions and 1 deletions
@@ -0,0 +1,3 @@
<?php
include $app->getExtensionRoot() . '/biz/attend/ext/view/stat.oa.html.hook.php';
?>
@@ -0,0 +1,3 @@
<script>
$('#headerActions').css("right", '210px');
</script>
@@ -45,7 +45,11 @@
{
foreach (explode('|', 'kanban|task|calendar|gantt|tree|grouptask') as $view)
{
if(common::hasPriv('execution', $view)) $kanbanview = $view; break;
if(common::hasPriv('execution', $view))
{
$kanbanview = $view;
break;
}
}
}
?>
+8
View File
@@ -240,6 +240,14 @@ class programModel extends model
foreach($products as $product)
{
$product->plans = zget($plans, $product->id, array());
/* Convert predefined HTML entities to characters. */
!empty($product->plans) && array_map(function($planVal)
{
return $planVal->title = htmlspecialchars_decode($planVal->title, ENT_QUOTES);
},
$product->plans);
$product->releases = zget($releases, $product->id, array());
$projects = zget($projectGroup, $product->id, array());
foreach($projects as $project)