From df6750f8ea43f0e42aaf9ee0aa14e4ced173cdab Mon Sep 17 00:00:00 2001 From: zhouxin Date: Thu, 28 Mar 2024 17:13:16 +0800 Subject: [PATCH] * Fix bug #47357. --- module/metric/config.php | 2 +- module/metric/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/metric/config.php b/module/metric/config.php index c6111e09b9..7ed428cda4 100644 --- a/module/metric/config.php +++ b/module/metric/config.php @@ -36,7 +36,7 @@ $config->metric->actionList['delete']['data-confirm'] = $lang->metric->confirmDe $config->metric->actionList['recalculate']['icon'] = 'refresh'; $config->metric->actionList['recalculate']['text'] = $lang->metric->recalculate; -$config->metric->actionList['recalculate']['hint'] = $lang->metric->recalculate; +$config->metric->actionList['recalculate']['hint'] = $lang->metric->recalculateBtnText; $config->metric->actionList['recalculate']['url'] = 'javascript:confirmRecalculate("single", "{code}")'; $config->metric->necessaryMethodList = array('getStatement', 'calculate', 'getResult'); diff --git a/module/metric/model.php b/module/metric/model.php index e68adac37b..e545c9eccf 100755 --- a/module/metric/model.php +++ b/module/metric/model.php @@ -1468,7 +1468,7 @@ class metricModel extends model if($action['name'] == 'recalculate') { $isClick = $metric->canRecalculate; - if($metric->stage == 'released' && !empty($metric->dateType) && $metric->dateType != 'nodate') $metric->actions[$key]['hint'] = $this->lang->metric->tips->banRecalculate; + if($metric->stage != 'released' || (!empty($metric->dateType) && $metric->dateType == 'nodate')) $metric->actions[$key]['hint'] = $this->lang->metric->tips->banRecalculate; } $metric->actions[$key]['disabled'] = !$isClick;