diff --git a/application/admin/views/scripts/data/ref-data-add.phtml b/application/admin/views/scripts/data/ref-data-add.phtml
index 5624f118..5b556524 100644
--- a/application/admin/views/scripts/data/ref-data-add.phtml
+++ b/application/admin/views/scripts/data/ref-data-add.phtml
@@ -99,8 +99,8 @@ table thead tr th {background:#EBF2F6;}
= $this->referenceType[$item['reftype']] ?> |
= $item['place'] ?> |
- 编辑
- 删除
+ 编辑
+ 移除
|
diff --git a/application/admin/views/scripts/data/ref-nav.phtml b/application/admin/views/scripts/data/ref-nav.phtml
index 24db0df8..97e50ac8 100644
--- a/application/admin/views/scripts/data/ref-nav.phtml
+++ b/application/admin/views/scripts/data/ref-nav.phtml
@@ -1,6 +1,6 @@
uuid)) : ?>
- - 数据文献
+ - 数据文献
- ac) && empty($this->uuid) ? 'class="active"':"" ?>>浏览所有
- ac=="water" ? 'class="active"':"" ?>>WATER文献
diff --git a/application/module/Reference/Reference.php b/application/module/Reference/Reference.php
index 5b525a92..a1f0afb3 100644
--- a/application/module/Reference/Reference.php
+++ b/application/module/Reference/Reference.php
@@ -332,7 +332,38 @@ class Reference
$order = "ref.{$this->order} {$this->sort}";
}
- $sql="select distinct ref.*,r.reftype,r.place,r.id as mrid from {$this->table->reference} ref left join mdref r on ref.id=r.refid
+ $sql="select distinct ref.*,r.reftype,r.place,r.id as mrid from {$this->table->reference} ref left join {$this->table->metadata_reference} r on ref.id=r.refid
+ $wheresql
+ ORDER BY $order";
+ $rs=$this->db->query($sql);
+ return $rs->fetchAll();
+ }
+
+ //Get references with data UUID
+ public function fetchReferencesWithUUID($uuid)
+ {
+ $wheresql = array();
+ //$wheresql[]=" r.uuid='$uuid' ";
+ if(!empty($this->keyword))
+ {
+ $wheresql[] = " (ref.title LIKE '%{$this->keyword}%' OR ref.reference LIKE '%{$this->keyword}%') ";
+ }
+ if(count($wheresql)>0)
+ {
+ $wheresql = " WHERE ".join(" AND ",$wheresql);
+ }else{
+ $wheresql = "";
+ }
+
+ if(empty($this->order))
+ {
+ $order = "ref.year,ref.title";
+ }else{
+ $order = "ref.{$this->order} {$this->sort}";
+ }
+
+ $sql="select distinct ref.*,r.reftype,r.place,r.id as mrid from {$this->table->reference} ref left join
+ (select * from {$this->table->metadata_reference} r where uuid='$uuid') r on ref.id=r.refid
$wheresql
ORDER BY $order";
$rs=$this->db->query($sql);