* Fix bug #20712,20800.

This commit is contained in:
tanghucheng
2022-03-16 16:21:12 +08:00
parent cc6c164063
commit bc67d443e2
6 changed files with 6 additions and 22 deletions
@@ -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)
{
+1 -2
View File
@@ -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)
{
@@ -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__);?>
@@ -1,6 +1 @@
<script>
$(function()
{
$('#begin, #end, #hours').parent().addClass('required');
})
</script>
<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
@@ -1,6 +1 @@
<script>
$(function()
{
$('#begin, #end, #hours').parent().addClass('required');
})
</script>
<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
@@ -0,0 +1 @@
<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>