From a9853df64cd203918ae5ec05818d8dafaf9a979a Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Thu, 16 Feb 2012 04:04:32 +0000
Subject: [PATCH] fix ticket #300.

---
 application/admin/controllers/DownController.php      | 2 +-
 application/admin/views/scripts/down/offlineapp.phtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/admin/controllers/DownController.php b/application/admin/controllers/DownController.php
index e7547136..1421f288 100644
--- a/application/admin/controllers/DownController.php
+++ b/application/admin/controllers/DownController.php
@@ -183,7 +183,7 @@ class Admin_DownController extends Zend_Controller_Action
 			//if		
 		}//reset
 				
-		$select="select distinct(o.*) from offlineapp o 
+		$select="select distinct(o.*),d.status as datastatus from offlineapp o 
 				left join dataorder d on o.id=d.offlineappid";
 		if ($status==4)
 			$select.=" where o.ts_approved is null 
diff --git a/application/admin/views/scripts/down/offlineapp.phtml b/application/admin/views/scripts/down/offlineapp.phtml
index beea37a8..1d4f1dc9 100644
--- a/application/admin/views/scripts/down/offlineapp.phtml
+++ b/application/admin/views/scripts/down/offlineapp.phtml
@@ -56,7 +56,7 @@
   <td><textarea readonly="readonly" style="width:300px;height:100px;border:none;font-size:12px;<?php if($autoindex%2 == 0) echo 'background:#CCCCCC;'; else echo 'background:#FFF;'; ?>"><?= $item['datalist']; ?></textarea></td>
   <td><?= date('Y-m-d',strtotime($item['ts_created'])); ?></td>
   <td>
-<?php if ($item['status']==3) : ?> 	
+<?php if ($item['datastatus']==3) : ?> 	
  	<a href="/admin/down/offlineapp/start/<?= $item['id']; ?>" onclick="return confirm('确定收到该申请?')">收到</a>
 <?php endif; ?>
  	<a href="/admin/down/offlineapp/finish/<?= $item['id']; ?>" onclick="return confirm('确定确定通过该申请?')">通过</a>