From 75e02e86cfdb0b45d44095bfed41725fcd8dc01b Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Thu, 1 Aug 2013 11:14:30 +0800 Subject: [PATCH] * code for task#1657. --- module/doc/control.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 841c6f8ae8..a8f41d42ea 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -417,16 +417,24 @@ class doc extends control } else { - $response['result'] = 'success'; - $response['message'] = ''; - $this->doc->delete(TABLE_DOC, $docID); - if(dao::isError()) + + /* if ajax request, send result. */ + if($this->server->ajax) { - $response['result'] = 'fail'; - $response['message'] = dao::getError(); + if(dao::isError()) + { + $response['result'] = 'fail'; + $response['message'] = dao::getError(); + } + else + { + $response['result'] = 'success'; + $response['message'] = ''; + } + $this->send($response); } - $this->send($response); + die(js::locate($this->session->docList, 'parent')); } } }