From 3bfb53767a9a29376d8a8c7c7512cb14e5136c02 Mon Sep 17 00:00:00 2001 From: wlx Date: Mon, 15 Jul 2013 13:33:19 +0000 Subject: [PATCH] merge heihedata branch from r3802 to r3810 into trunk --- .../admin/controllers/ReviewController.php | 28 ++- .../admin/views/scripts/review/accept.phtml | 2 +- .../admin/views/scripts/review/editor.phtml | 60 +++++++ .../admin/views/scripts/review/left.phtml | 1 + .../default/controllers/HeiheController.php | 30 ++++ .../views/scripts/heihe/offlinelist.phtml | 34 ++++ .../views/scripts/heihe/onlinelist.phtml | 34 ++++ application/models/data/Review.php | 60 ++++++- application/models/helper/email.php | 164 ++++++++++++++++++ 9 files changed, 402 insertions(+), 11 deletions(-) create mode 100644 application/admin/views/scripts/review/editor.phtml create mode 100755 application/default/views/scripts/heihe/offlinelist.phtml create mode 100755 application/default/views/scripts/heihe/onlinelist.phtml create mode 100644 application/models/helper/email.php diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php index 397f61d0..001217bf 100644 --- a/application/admin/controllers/ReviewController.php +++ b/application/admin/controllers/ReviewController.php @@ -123,6 +123,24 @@ class Admin_ReviewController extends Zend_Controller_Action } }//changestatus 更改状态 + function editorAction() + { + include_once("helper/view.php"); + include_once("data/Review.php"); + + $this->view->keyword = $keyword = $this->_request->getParam('keyword'); + + $review = new Review(); + if(!empty($keyword)) + { + $filter['keyword'] = $keyword; + $data = $review->needEditor($filter); + }else{ + $data = $review->needEditor(); + } + + \view::addPaginator($data,$this,NULL,20); + } /* * acceptAction()待审元数据 @@ -191,16 +209,12 @@ class Admin_ReviewController extends Zend_Controller_Action $sql = "select m.*,md.title,u.username,u.realname from mdstatus m right join metadata md on md.uuid=m.uuid left join users u on u.id=m.userid - where m.status in (1,2,3,4) order by m.ts_created desc"; + where m.status in (1,2,3,4) + order by m.ts_created desc"; $re = $this->db->query($sql); $rows = $re->fetchAll(); - $paginator = Zend_Paginator::factory($rows); - $paginator->setCurrentPageNumber($this->_getParam('page')); - $paginator->setItemCountPerPage($this->view->config->page->max); - $paginator->setView($this->view); - Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml'); - $this->view->paginator=$paginator; + \view::addPaginator($rows,$this,NULL,20); }//列表 }//acceptAction diff --git a/application/admin/views/scripts/review/accept.phtml b/application/admin/views/scripts/review/accept.phtml index 80f06c7c..4f44491d 100644 --- a/application/admin/views/scripts/review/accept.phtml +++ b/application/admin/views/scripts/review/accept.phtml @@ -48,7 +48,7 @@ table thead tr th {background:#EBF2F6;color:#444;} - 分配编辑 + 更改责任编辑 diff --git a/application/admin/views/scripts/review/editor.phtml b/application/admin/views/scripts/review/editor.phtml new file mode 100644 index 00000000..80f06c7c --- /dev/null +++ b/application/admin/views/scripts/review/editor.phtml @@ -0,0 +1,60 @@ +headTitle($this->config->title->site); + $this->headTitle('后台管理'); + $this->headTitle()->setSeparator(' - '); + $this->breadcrumb('首页'); + $this->breadcrumb('后台首页'); + $this->breadcrumb('元数据评审'); + $this->breadcrumb()->setSeparator(' > '); +?> + +
+
+ partial('review/left.phtml'); ?> +
+
+ msg or $this->messages) :?> +
+ msg) : ?> +

msg; ?>

+ messages): foreach($this->messages as $msg): ?> +

+ +
+ + + + + + + + + + + + + paginator)): ?> + + paginator as $item): ?> + + + + + + + + + +
元数据标题责任编辑接收时间操作
+ 分配编辑 +
+ +
+
\ No newline at end of file diff --git a/application/admin/views/scripts/review/left.phtml b/application/admin/views/scripts/review/left.phtml index 1937f856..b9ce7de6 100644 --- a/application/admin/views/scripts/review/left.phtml +++ b/application/admin/views/scripts/review/left.phtml @@ -1,6 +1,7 @@