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

删除了等待评审和我评审过的中的测试代码，增加登录跳转

This commit is contained in:
Li Jianxuan 2013-07-09 01:35:21 +00:00
parent 68d6f6a0bd
commit c94f452eb6
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
application/default/controllers/ReviewController.php
View File

@ -146,14 +146,19 @@ class ReviewController extends Zend_Controller_Action
$this->view->pageID = "review-inreview-require"; $this->view->pageID = "review-inreview-require";
$uid = view::User('id'); $uid = view::User('id');
$sql = "select m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id as gid,t.filename,r.ts_created,r.id,e.id as eid if(empty($uid))
{
view::Post($this,"请先登录","/account/login/?href=".urlencode("/review/inreview/ac/require"));
}
$sql = "select m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id as gid,t.filename,r.ts_created,r.id as rid,e.id as eid
from mdstatus s from mdstatus s
right join normalmetadata m on s.uuid=m.uuid right join normalmetadata m on s.uuid=m.uuid
left join geonetworkmetadata g on g.uuid=m.uuid left join geonetworkmetadata g on g.uuid=m.uuid
left join thumbnail t on t.id=m.id left join thumbnail t on t.id=m.id
left join mdreview r ON m.uuid=r.uuid left join mdreview r ON m.uuid=r.uuid
left join mdexpertreview e ON (e.id = s.userid AND e.uuid=m.uuid) left join mdexpertreview e ON e.uuid=m.uuid
WHERE s.status in (2,3,4) AND s.userid=8018 AND r.id IS NULL WHERE s.status in (2,3,4) AND r.id IS NULL
GROUP BY m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id,t.filename,s.ts_created,r.ts_created,r.id,e.id GROUP BY m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id,t.filename,s.ts_created,r.ts_created,r.id,e.id
order by e.id DESC,s.ts_created desc,m.title"; order by e.id DESC,s.ts_created desc,m.title";
$rs = $this->db->query($sql); $rs = $this->db->query($sql);
@ -165,13 +170,19 @@ class ReviewController extends Zend_Controller_Action
$this->_helper->viewRenderer('inreview-reviewed'); $this->_helper->viewRenderer('inreview-reviewed');
$this->view->pageID = "review-inreview-reviewed"; $this->view->pageID = "review-inreview-reviewed";
$uid = view::User('id'); $uid = view::User('id');
if(empty($uid))
{
view::Post($this,"请先登录","/account/login/?href=".urlencode("/review/inreview/ac/reviewed"));
}
$sql = "select m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id as gid,t.filename,r.ts_created $sql = "select m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id as gid,t.filename,r.ts_created
from mdstatus s from mdstatus s
right join normalmetadata m on s.uuid=m.uuid right join normalmetadata m on s.uuid=m.uuid
left join geonetworkmetadata g on g.uuid=m.uuid left join geonetworkmetadata g on g.uuid=m.uuid
left join thumbnail t on t.id=m.id left join thumbnail t on t.id=m.id
left join mdreview r ON m.uuid=r.uuid left join mdreview r ON m.uuid=r.uuid
WHERE s.status in (2,3,4) AND s.userid=8018 AND r.userid=8018 WHERE s.status in (2,3,4) AND r.userid=$uid
GROUP BY m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id,t.filename,s.ts_created,r.ts_created GROUP BY m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id,t.filename,s.ts_created,r.ts_created
order by s.ts_created desc,m.title"; order by s.ts_created desc,m.title";
$rs = $this->db->query($sql); $rs = $this->db->query($sql);