From b6b4010892fcc898ba6c78fbe3cdbb49d7b50bb5 Mon Sep 17 00:00:00 2001
From: xia0ta0 <xia0ta0@outlook.com>
Date: Thu, 1 Aug 2013 10:44:08 +0800
Subject: [PATCH]  * code for task#1657.

---
 module/group/control.php          | 16 ++++++++++++++++
 module/group/view/browse.html.php |  8 ++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/module/group/control.php b/module/group/control.php
index f1fb2e3814..72b4208be8 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -233,6 +233,22 @@ class group extends control
         else
         {
             $this->group->delete($groupID);
+
+            /* if ajax request, send result. */
+            if($this->server->ajax)
+            {
+                if(dao::isError())
+                {
+                    $response['result']  = 'fail';
+                    $response['message'] = dao::getError();
+                }
+                else
+                {
+                    $response['result']  = 'success';
+                    $response['message'] = '';
+                }
+                $this->send($response);
+            }
             die(js::locate($this->createLink('group', 'browse'), 'parent'));
         }
     }
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index edfd68ec38..f0866986b3 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -12,7 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<table align='center' class='table-1 tablesorter fixed'>
+<?php js::set('confirmDelete', $lang->group->confirmDelete);?>
+<table align='center' class='table-1 tablesorter fixed' id='groupList'>
   <caption class='caption-tl pb-10px'>
     <div class='f-left'><?php echo $lang->group->browse;?></div>
     <div class='f-right'><?php common::printIcon('group', 'create');?></div>
@@ -41,7 +42,10 @@
       <?php common::printIcon('group', 'managemember', "groupID=$group->id", '', 'list');?>
       <?php common::printIcon('group', 'edit',         "groupID=$group->id", '', 'list');?>
       <?php common::printIcon('group', 'copy',         "groupID=$group->id", '', 'list');?>
-      <?php common::printIcon('group', 'delete',       "groupID=$group->id", '', 'list', '', "hiddenwin");?>
+      <?php
+      $deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
+      echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"groupList\",confirmDelete)", '&nbsp;', '', "class='icon-green-common-delete' title='{$lang->group->delete}'");
+      ?>
     </td>
   </tr>
   <?php endforeach;?>