From dd9a48ddd344e7bc81407456559c3a5c892c6781 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Thu, 9 Jan 2014 02:34:33 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E5=8F=B0=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E7=9A=84=E6=8A=95=E7=A8=BF=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controllers/ReviewController.php | 3 ++-
 application/admin/views/scripts/review/draft.phtml | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php
index 5d43ef71..af2650e7 100644
--- a/application/admin/controllers/ReviewController.php
+++ b/application/admin/controllers/ReviewController.php
@@ -805,9 +805,10 @@ class Admin_ReviewController extends Zend_Controller_Action
 			$this->view->keyword = $keyword;
 		}
 		
-		$sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_created from mdstatus m
+		$sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_created,gn.id as gnid from mdstatus m
 				right join metadata md on md.uuid=m.uuid
 				left join users u on u.id=m.userid
+				left join geonetworkmetadata gn on m.uuid=gn.uuid
 				where status=0 $searchjoin order by m.ts_created desc";
 				
 		$re = $this->db->query($sql);
diff --git a/application/admin/views/scripts/review/draft.phtml b/application/admin/views/scripts/review/draft.phtml
index b0e14656..9d3853f5 100644
--- a/application/admin/views/scripts/review/draft.phtml
+++ b/application/admin/views/scripts/review/draft.phtml
@@ -44,9 +44,10 @@ table thead tr th {background:#EBF2F6;color:#444;}
             <?php foreach ($this->paginator as $item): ?>
             <tr>
             <td><input type="checkbox" name="update[]" value="<?php echo $item['id']; ?>"/></td>
-            <td><a href="/data/<?php echo $item['uuid'];?>"><?php echo $item['title']; ?></a></td>
+            <td><?php echo $item['title']; ?>【<a href="/service/geonetwork?url=metadata.show?id=<?php echo $item['gnid'];?>">GeoNetwork查看</a>】</td>
             <td><?php echo date("Y-m-d H:i",strtotime($item['ts_created']));?></td>
-            <td><a href="/admin/review/draft/update/<?php echo $item['id']; ?>">接收</a>
+            <td><a href="/admin/review/draft/update/<?php echo $item['id']; ?>">接收</a> |
+	    <a href="/admin/review/accept/cancel/<?php echo $item['id']; ?>">取消评审</a>
             </td>
             </tr>
             <?php endforeach; ?>