From 3dbbc4b3f06a2a116a4c7e4bb562cdf20f51af9d Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Thu, 17 Feb 2022 15:02:18 +0800
Subject: [PATCH] *Finish task 49286.

---
 module/search/control.php             | 4 ++--
 module/search/lang/en.php             | 1 +
 module/search/lang/zh-cn.php          | 1 +
 module/search/view/savequery.html.php | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/search/control.php b/module/search/control.php
index 85de079e65..89673a6f17 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -103,12 +103,12 @@ class search extends control
         if($_POST)
         {
             $queryID = $this->search->saveQuery();
-            if(!$queryID) die(js::error(dao::getError()));
+            if(!$queryID) return print(js::error(dao::getError()));
 
             $data     = fixer::input('post')->get();
             $shortcut = empty($data->onMenuBar) ? 0 : 1;
 
-            die(js::closeModal('parent.parent', '', "function(){parent.parent.loadQueries($queryID, $shortcut, '{$data->title}')}"));
+            return print(js::closeModal('parent.parent', '', "function(){parent.parent.loadQueries($queryID, $shortcut, '{$data->title}')}"));
         }
         $this->view->module    = $module;
         $this->view->onMenuBar = $onMenuBar;
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 78e4db7e8f..1c2c8d9f9a 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -29,6 +29,7 @@ $lang->search->me            = 'Me';
 $lang->search->noQuery       = 'No query is saved yet!';
 $lang->search->onMenuBar     = 'Show in Menu';
 $lang->search->custom        = 'Custom';
+$lang->search->setCommon     = 'Set as public query criteria';
 
 $lang->search->account  = 'Account';
 $lang->search->module   = 'Module';
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index c7d5f00f49..ad6c1812bc 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -29,6 +29,7 @@ $lang->search->me            = '自己';
 $lang->search->noQuery       = '还没有保存查询！';
 $lang->search->onMenuBar     = '显示在菜单栏';
 $lang->search->custom        = '自定义';
+$lang->search->setCommon     = '设为公共查询条件';
 
 $lang->search->account  = '用户名';
 $lang->search->module   = '模块';
diff --git a/module/search/view/savequery.html.php b/module/search/view/savequery.html.php
index 10fc96a318..6f1de90691 100644
--- a/module/search/view/savequery.html.php
+++ b/module/search/view/savequery.html.php
@@ -17,7 +17,7 @@
     <span class='input-group-addon'>
       <div class="checkbox-primary">
         <input type="checkbox" name="common" value="1" id="common" />
-        <label for="common"><?php echo "设为公共搜索条件";?></label>
+        <label for="common"><?php echo $lang->search->setCommon;?></label>
       </div>
     </span>
     <?php if($onMenuBar == 'yes'):?>