From eff03084c3a64b30845412cee5657f900c6f5de8 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Sat, 12 Mar 2016 22:09:06 +0800
Subject: [PATCH] * if save search query successfully, display the query title
 in query select box.

---
 module/search/control.php             | 14 +++++++++-----
 module/search/model.php               |  9 +++++++++
 module/search/view/buildform.html.php |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/module/search/control.php b/module/search/control.php
index 9b00ebacb5..34b3d88025 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -63,9 +63,11 @@ class search extends control
      */
     public function saveQuery()
     {
-        $this->search->saveQuery();
-        if(dao::isError()) die(js::error(dao::getError()));
-        die('success');
+        $queryID = $this->search->saveQuery();
+
+        if(!$queryID) die(js::error(dao::getError()));
+
+        die($queryID);
     }
 
     /**
@@ -86,13 +88,15 @@ class search extends control
      * AJAX: get search query.
      *
      * @param  string $module
+     * @param  int    $queryID
      * @access public
      * @return void
      */
-    public function ajaxGetQuery($module = '')
+    public function ajaxGetQuery($module = '', $queryID = 0)
     {
+        $query   = $queryID ? $queryID : '';
         $module  = empty($module) ? $this->session->searchParams['module'] : $module;
         $queries = $this->search->getQueryPairs($module);
-        die(html::select('queryID', $queries, '', 'onchange=executeQuery(this.value) class=form-control'));
+        die(html::select('queryID', $queries, $query, 'onchange=executeQuery(this.value) class=form-control'));
     }
 }
diff --git a/module/search/model.php b/module/search/model.php
index 3d085e292a..dda8e5d7a2 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -249,6 +249,15 @@ class searchModel extends model
             ->skipSpecial('sql,form')
             ->get();
         $this->dao->insert(TABLE_USERQUERY)->data($query)->autoCheck()->check('title', 'notempty')->exec();
+
+        if(!dao::isError())
+        {
+            return $this->dao->lastInsertID();
+        }
+        else
+        {
+            return false;
+        }
     }
 
     /**
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 2ff8f7796e..28f3f22733 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -245,7 +245,7 @@ function saveQuery()
         saveQueryLink = createLink('search', 'saveQuery');
         $.post(saveQueryLink, {title: r, module: module}, function(data)
         {
-            if(data == 'success') $('#queryBox').load(createLink('search', 'ajaxGetQuery', 'module=' + module));
+            if(data) $('#queryBox').load(createLink('search', 'ajaxGetQuery', 'module=' + module + '&queryID=' + data));
         });
     });
 }