diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 78e428e5..02dd2cf6 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -209,7 +209,7 @@ class Admin_DataController extends Zend_Controller_Action { $add=(int)$this->_getParam('add'); $edit=(int)$this->_getParam('edit'); - $delete=(int)$this->_getParam('delete'); + $delete=(int)$this->_getParam('delete'); set_time_limit(0); if ($add) { $form=new DatasetcdForm(); @@ -3626,7 +3626,7 @@ class Admin_DataController extends Zend_Controller_Action { $ac = $this->_getParam('ac'); $submit = $this->_getParam('submit'); - $uuid = $this->_getParam('uuid'); + $uuid = $this->_getParam('uuid'); $q=$this->_getParam('q'); include_once("data/Doi.php"); @@ -3667,11 +3667,11 @@ class Admin_DataController extends Zend_Controller_Action { $this->view->uuid = $uuid; $this->view->data = $doi->view($uuid); + include('data/Metadata.php'); + $md = new Metadata($this->db); + $metadata = $md->view($uuid); if(empty($this->view->data)) { - include('data/Metadata.php'); - $md = new Metadata($this->db); - $metadata = $md->view($uuid); $this->view->data = array( 'uuid'=>$uuid, 'title'=>$metadata['title'], @@ -3682,6 +3682,7 @@ class Admin_DataController extends Zend_Controller_Action 'publisher_en'=>'Cold and Arid Regions Science Data Center at Lanzhou', ); }else{ + $this->view->data['doi'] = $metadata['doi']; $this->view->data['info'] = $doi->data_process_out($this->view->data); } }else{ diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php index 3a703bf6..397f61d0 100644 --- a/application/admin/controllers/ReviewController.php +++ b/application/admin/controllers/ReviewController.php @@ -586,6 +586,8 @@ class Admin_ReviewController extends Zend_Controller_Action $search=$this->_request->getParam('search'); $filter['keyword'] = $this->_request->getParam('keyword'); $filter['code'] = $this->_request->getParam('code'); + $filter['order'] = $this->_request->getParam('order'); + $filter['sort'] = $this->_request->getParam('sort'); $review = new Review($this->db); if(!empty($search) && !empty($filter)) @@ -593,6 +595,9 @@ class Admin_ReviewController extends Zend_Controller_Action $rows = $review->adminReviews($filter); $this->view->keyword = $filter['keyword']; $this->view->code = $filter['code']; + }if(!empty($filter)) + { + $rows = $review->adminReviews($filter); }else{ $rows = $review->adminReviews(); } diff --git a/application/admin/views/scripts/data/doi.phtml b/application/admin/views/scripts/data/doi.phtml index e7433d50..e7d54fd1 100644 --- a/application/admin/views/scripts/data/doi.phtml +++ b/application/admin/views/scripts/data/doi.phtml @@ -56,8 +56,10 @@ table thead tr th {background:#EBF2F6;} + 编辑 导出 + 验证 删除 diff --git a/application/admin/views/scripts/review/accept.phtml b/application/admin/views/scripts/review/accept.phtml index a2c24848..80f06c7c 100644 --- a/application/admin/views/scripts/review/accept.phtml +++ b/application/admin/views/scripts/review/accept.phtml @@ -36,7 +36,7 @@ table thead tr th {background:#EBF2F6;color:#444;} - + diff --git a/application/admin/views/scripts/review/myreview.phtml b/application/admin/views/scripts/review/myreview.phtml index 7e2db66e..f0346448 100644 --- a/application/admin/views/scripts/review/myreview.phtml +++ b/application/admin/views/scripts/review/myreview.phtml @@ -7,6 +7,7 @@ $this->breadcrumb('元数据评审'); $this->breadcrumb()->setSeparator(' > '); $this->theme->AppendPlus($this,'colorbox'); + $this->theme->AppendModel($this,'sfadmin'); ?>
元数据标题负责编辑责任编辑 接收时间 操作