From 967eae981608bd9295065c8d69931446b9b36845 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 6 Mar 2024 14:32:47 +0800
Subject: [PATCH] * Use default scope and period.

---
 module/metric/ui/create.html.php |  4 ++--
 module/metric/zen.php            | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/metric/ui/create.html.php b/module/metric/ui/create.html.php
index 3407bd12d2..65677dcb21 100644
--- a/module/metric/ui/create.html.php
+++ b/module/metric/ui/create.html.php
@@ -42,7 +42,7 @@ formPanel
             set::label($lang->metric->scope),
             set::name('scope'),
             set::items($lang->metric->scopeList),
-            set::value('system'),
+            set::value($scope),
             set::required(true)
         ),
         formGroup
@@ -69,7 +69,7 @@ formPanel
         set::label($lang->metric->dateType),
         set::name('dateType'),
         set::items($lang->metric->dateTypeList),
-        set::value('nodate'),
+        set::value($period),
         set::width('1/2'),
         set::required(true)
     ),
diff --git a/module/metric/zen.php b/module/metric/zen.php
index 21a4c3948c..e342bd75a7 100644
--- a/module/metric/zen.php
+++ b/module/metric/zen.php
@@ -45,19 +45,19 @@ class metricZen extends metric
      * 成功插入度量数据后，其他的额外操作。
      * Process after create metric.
      *
-     * @param  string    $scope
+     * @param  int       $metricID
+     * @param  string    $afterCreate
+     * @param  string    $fromURL
      * @access protected
      * @return array
      */
-    protected function responseAfterCreate($metricID, $scope, $afterCreate)
+    protected function responseAfterCreate($metricID, $afterCreate, $location)
     {
-        if($afterCreate == 'back')
+        if($afterCreate == 'back' && $location)
         {
-            $location = $this->createLink('metric', 'browse', "scope=$scope");
             return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $location);
         }
 
-        $closeModal = false;
         $location = $this->createLink('metric', 'implement', "metricID=$metricID");
         $callback = array('name' => 'loadImplement', 'params' => $location);
         return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'callback' => $callback);