* code for task#808.

2013-01-23 08:31:54 +00:00
parent 166560f243
commit c87180211a
9 changed files with 35 additions and 26 deletions
@@ -171,8 +171,6 @@ class admin extends control
     */
    public function clearData($confirm = '')
    {
-        if($confirm == '') $this->display();
-
        if($confirm == 'no')
        {
            die(js::confirm($this->lang->admin->confirmClearData, inlink('clearData', "confirm=yes")));
@@ -180,12 +178,14 @@ class admin extends control
        elseif($confirm == 'yes')
        {
            $result = $this->admin->clearData();
-            if($result)
-            {
-                die(js::alert($this->lang->admin->clearDataSucceed));
-            }
-            die(js::alert($this->lang->admin->clearDataFailed));
+
+            if(!$result) die(js::alert($this->lang->admin->clearDataFailed));
+
+            js::alert($this->lang->admin->clearDataSucceed);
+            die(js::locate(inLink('index'), 'parent'));
        }
+
+        $this->display();
    }

    /**