From 06f066f45d1b614fdd7af07d6e5a48c8b5738b33 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Fri, 1 Apr 2022 14:15:11 +0800 Subject: [PATCH 1/4] * fix bug #18722 --- module/program/model.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/module/program/model.php b/module/program/model.php index 49c9e07f15..719664d99c 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -240,6 +240,12 @@ 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) From 7773a8a5300053af0b0842efa53688fbbd6111c1 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Fri, 1 Apr 2022 15:32:36 +0800 Subject: [PATCH 2/4] * fix bug kanban prev --- extension/lite/project/ext/view/execution.html.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php index 1b1532be26..7cd26c33f0 100644 --- a/extension/lite/project/ext/view/execution.html.php +++ b/extension/lite/project/ext/view/execution.html.php @@ -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; + } } } ?> From 875db6213f2932329b0407afd89f16eaf93ac18a Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Sat, 2 Apr 2022 09:45:58 +0800 Subject: [PATCH 3/4] * fix bug #19905 --- extension/lite/attend/ext/view/stat.oa.html.hook.php | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 extension/lite/attend/ext/view/stat.oa.html.hook.php diff --git a/extension/lite/attend/ext/view/stat.oa.html.hook.php b/extension/lite/attend/ext/view/stat.oa.html.hook.php new file mode 100644 index 0000000000..80add58d8e --- /dev/null +++ b/extension/lite/attend/ext/view/stat.oa.html.hook.php @@ -0,0 +1,3 @@ +getExtensionRoot().'/biz/attend/ext/view/stat.oa.html.hook.php'; +?> \ No newline at end of file From f61cdef8d04b288f18a49ad5488f27bd80772bcb Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Sat, 2 Apr 2022 10:56:10 +0800 Subject: [PATCH 4/4] * fix bug #21424 --- extension/lite/attend/ext/view/stat.oa.html.hook.php | 2 +- extension/lite/kanban/ext/view/view.lite.html.hook.php | 3 +++ extension/lite/project/ext/view/execution.html.php | 4 ++-- module/program/model.php | 8 +++++--- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 extension/lite/kanban/ext/view/view.lite.html.hook.php diff --git a/extension/lite/attend/ext/view/stat.oa.html.hook.php b/extension/lite/attend/ext/view/stat.oa.html.hook.php index 80add58d8e..c5c67c3735 100644 --- a/extension/lite/attend/ext/view/stat.oa.html.hook.php +++ b/extension/lite/attend/ext/view/stat.oa.html.hook.php @@ -1,3 +1,3 @@ getExtensionRoot().'/biz/attend/ext/view/stat.oa.html.hook.php'; +include $app->getExtensionRoot() . '/biz/attend/ext/view/stat.oa.html.hook.php'; ?> \ No newline at end of file diff --git a/extension/lite/kanban/ext/view/view.lite.html.hook.php b/extension/lite/kanban/ext/view/view.lite.html.hook.php new file mode 100644 index 0000000000..77f9eb2951 --- /dev/null +++ b/extension/lite/kanban/ext/view/view.lite.html.hook.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php index 7cd26c33f0..ca24aa6403 100644 --- a/extension/lite/project/ext/view/execution.html.php +++ b/extension/lite/project/ext/view/execution.html.php @@ -47,8 +47,8 @@ { if(common::hasPriv('execution', $view)) { - $kanbanview = $view; - break; + $kanbanview = $view; + break; } } } diff --git a/module/program/model.php b/module/program/model.php index a875011a50..f7f4f5bb8b 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -242,9 +242,11 @@ class programModel extends model $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); + !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());