diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 78e428e5..f29bb4e1 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,12 @@ 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); + $this->view->data['doi'] = $metadata['doi']; 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'], 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;}