bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#303 修改了按数据查看时列表读取的判断逻辑

This commit is contained in:
Li Jianxuan 2012-03-22 10:16:00 +00:00
parent 8d794d0939
commit e47b464ac4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/default/controllers/AuthorController.php
View File

@ -276,7 +276,7 @@ class AuthorController extends Zend_Controller_Action
if(preg_match("/^[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{12}$/",$uuid)) if(preg_match("/^[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{12}$/",$uuid))
{ {
$sql = "select md.title,d.uuid,d.authorpermitted $sql = "select md.title,d.uuid,d.authorpermitted,d.status
,offa.id as offa_id,offa.username as offa_name,offa.unit as offa_unit,offa.email as offa_email,offa.project as offa_project ,offa.id as offa_id,offa.username as offa_name,offa.unit as offa_unit,offa.email as offa_email,offa.project as offa_project
,ona.id as ona_id,ona.username as ona_name,ona.unit as ona_unit,ona.email as ona_email,ona.project as ona_project ,ona.id as ona_id,ona.username as ona_name,ona.unit as ona_unit,ona.email as ona_email,ona.project as ona_project
from dataorder d from dataorder d
@ -284,7 +284,7 @@ class AuthorController extends Zend_Controller_Action
left join mdauthor a on a.uuid=d.uuid left join mdauthor a on a.uuid=d.uuid
LEFT JOIN offlineapp offa on offa.id=d.offlineappid LEFT JOIN offlineapp offa on offa.id=d.offlineappid
LEFT JOIN onlineapp ona on ona.id=d.onlineappid LEFT JOIN onlineapp ona on ona.id=d.onlineappid
WHERE (offa.id IS NOT NULL OR ona.id IS NOT NULL) AND d.status=4 AND a.status=1 WHERE (offa.id IS NOT NULL OR ona.id IS NOT NULL) AND a.status=1
AND d.uuid=? AND a.userid=? AND d.uuid=? AND a.userid=?
ORDER BY d.ts_created DESC"; ORDER BY d.ts_created DESC";
@ -317,7 +317,7 @@ class AuthorController extends Zend_Controller_Action
$sql = "select md.title,d.uuid,count(md.id) as c from dataorder d $sql = "select md.title,d.uuid,count(md.id) as c from dataorder d
left join metadata md on md.uuid=d.uuid left join metadata md on md.uuid=d.uuid
left join mdauthor a on a.uuid=d.uuid left join mdauthor a on a.uuid=d.uuid
where d.status=4 AND a.status=1 AND a.userid=? where a.status=1 AND a.userid=?
GROUP BY md.title,d.uuid"; GROUP BY md.title,d.uuid";
$sth = $this->db->prepare($sql); $sth = $this->db->prepare($sql);
@ -348,7 +348,7 @@ class AuthorController extends Zend_Controller_Action
$sql = "select md.title,d.uuid,count(md.id) as c from dataorder d $sql = "select md.title,d.uuid,count(md.id) as c from dataorder d
left join metadata md on md.uuid=d.uuid left join metadata md on md.uuid=d.uuid
left join mdauthor a on a.uuid=d.uuid left join mdauthor a on a.uuid=d.uuid
where d.status=4 AND a.status=1 AND a.userid=? AND (md.title like ? OR md.description like ?) where a.status=1 AND a.userid=? AND (md.title like ? OR md.description like ?)
GROUP BY md.title,d.uuid"; GROUP BY md.title,d.uuid";
$sth = $this->db->prepare($sql); $sth = $this->db->prepare($sql);

2
application/default/views/scripts/author/view-dataoreder.phtml
View File

@ -39,7 +39,7 @@ $this->breadcrumb()->setSeparator(' > ');
<p>单位:<?php echo $item['offa_unit'];?></p> <p>单位:<?php echo $item['offa_unit'];?></p>
<p>项目:<?php echo $item['offa_project'];?></p> <p>项目:<?php echo $item['offa_project'];?></p>
<p><span id="ct_<?php echo $item['offa_id'];?>"> <p><span id="ct_<?php echo $item['offa_id'];?>">
<?php echo $item['btns'];?> </span><span id="data_<?php echo $item['offa_id'];?>"></span></p> <?php if($item['status']==4): echo $item['btns']; endif;?> </span><span id="data_<?php echo $item['offa_id'];?>"></span></p>
</li> </li>
<?php <?php
endif; endif;