From bc67d443e2d3ec1d5a856842f7ebe2cc5cbdc161 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 16 Mar 2022 16:21:12 +0800
Subject: [PATCH] * Fix bug #20712,20800.

---
 extension/lite/execution/ext/control/kanban.php           | 2 +-
 extension/lite/execution/ext/model/lite.php               | 3 +--
 extension/lite/leave/ext/view/browse.oa.html.hook.php     | 8 +-------
 extension/lite/leave/ext/view/create.oa.html.hook.php     | 7 +------
 extension/lite/leave/ext/view/edit.oa.html.hook.php       | 7 +------
 .../lite/leave/ext/view/personalannual.oa.html.hook.php   | 1 +
 6 files changed, 6 insertions(+), 22 deletions(-)
 create mode 100644 extension/lite/leave/ext/view/personalannual.oa.html.hook.php

diff --git a/extension/lite/execution/ext/control/kanban.php b/extension/lite/execution/ext/control/kanban.php
index a368309fdf..5a0560abf5 100644
--- a/extension/lite/execution/ext/control/kanban.php
+++ b/extension/lite/execution/ext/control/kanban.php
@@ -19,7 +19,7 @@ class myExecution extends execution
         $TRActions  = $this->execution->getTRActions($currentMethod);
 
         $TRActions .= "<div class='dropdown'>";
-        $TRActions .= html::a('javascript:;', $this->lang->execution->kanbanGroup[$groupBy] . "<span class='caret'></span>", '', "data-toggle='dropdown' data- class='btn btn-link'");
+        $TRActions .= html::a('javascript:;', $this->lang->execution->kanbanGroup[$groupBy] . " <span class='caret'></span>", '', "data-toggle='dropdown' data- class='btn btn-link'");
         $TRActions .= "<ul class='dropdown-menu pull-right course-groupBy'>";
         foreach($this->lang->execution->kanbanGroup as $groupKey => $groupName)
         {
diff --git a/extension/lite/execution/ext/model/lite.php b/extension/lite/execution/ext/model/lite.php
index c3d5f927f4..59e6584012 100644
--- a/extension/lite/execution/ext/model/lite.php
+++ b/extension/lite/execution/ext/model/lite.php
@@ -115,8 +115,7 @@ public function getTRActions($currentMethod)
 
     $TRActions  = '';
     $TRActions .= "<div class='btn-group dropdown'>";
-    $TRActions .= html::a(helper::createLink('execution', $subMenu->{$currentMethod}['method'], $subMenu->{$currentMethod}['vars']), "<i class='icon icon-" . $this->lang->execution->icons[$currentMethod]."'> </i>" . $subMenu->{$currentMethod}['name'], '', "class='btn btn-link'");
-    $TRActions .= "<button type='button' class='btn btn-link' data-toggle='dropdown'><span class='caret'></span></button>";
+    $TRActions .= html::a("javascript:;", "<i class='icon icon-" . $this->lang->execution->icons[$currentMethod]."'> </i>" . $subMenu->{$currentMethod}['name'] . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
     $TRActions .= "<ul class='dropdown-menu pull-right'>";
     foreach($subMenu as $subKey => $subName)
     {
diff --git a/extension/lite/leave/ext/view/browse.oa.html.hook.php b/extension/lite/leave/ext/view/browse.oa.html.hook.php
index cfb4b19194..7a72fbf63f 100644
--- a/extension/lite/leave/ext/view/browse.oa.html.hook.php
+++ b/extension/lite/leave/ext/view/browse.oa.html.hook.php
@@ -1,7 +1 @@
-<?php js::set('type', $type)?>
-<script>
-$(function()
-{
-    $('#<?php echo $type?>').addClass('active');
-})
-</script>
+<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
diff --git a/extension/lite/leave/ext/view/create.oa.html.hook.php b/extension/lite/leave/ext/view/create.oa.html.hook.php
index f0df39d0c4..7a72fbf63f 100644
--- a/extension/lite/leave/ext/view/create.oa.html.hook.php
+++ b/extension/lite/leave/ext/view/create.oa.html.hook.php
@@ -1,6 +1 @@
-<script>
-$(function()
-{
-    $('#begin, #end, #hours').parent().addClass('required');
-})
-</script>
\ No newline at end of file
+<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
diff --git a/extension/lite/leave/ext/view/edit.oa.html.hook.php b/extension/lite/leave/ext/view/edit.oa.html.hook.php
index f0df39d0c4..7a72fbf63f 100644
--- a/extension/lite/leave/ext/view/edit.oa.html.hook.php
+++ b/extension/lite/leave/ext/view/edit.oa.html.hook.php
@@ -1,6 +1 @@
-<script>
-$(function()
-{
-    $('#begin, #end, #hours').parent().addClass('required');
-})
-</script>
\ No newline at end of file
+<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
diff --git a/extension/lite/leave/ext/view/personalannual.oa.html.hook.php b/extension/lite/leave/ext/view/personalannual.oa.html.hook.php
new file mode 100644
index 0000000000..7a72fbf63f
--- /dev/null
+++ b/extension/lite/leave/ext/view/personalannual.oa.html.hook.php
@@ -0,0 +1 @@
+<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>