Issue #770. The id of a Patient object should be accessible via an in…

…tuitive API function.
phenotips · Mar 7, 2014 · b216b59 · b216b59
1 parent 55a336e
commit b216b59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...l/src/main/java/org/phenotips/data/similarity/internal/AbstractPatientSimilarityView.java b/...l/src/main/java/org/phenotips/data/similarity/internal/AbstractPatientSimilarityView.java
@@ -95,12 +95,7 @@ public AbstractPatientSimilarityView(Patient match, Patient reference, AccessTyp
     @Override
     public String getId()
     {
-        DocumentReference document = this.getDocument();
-        if (document != null) {
-            return document.getName();
-        } else {
-            return null;
-        }
+        return this.match.getId();
     }
 
     @Override

diff --git a/...src/main/java/org/phenotips/data/similarity/internal/RestrictedPatientSimilarityView.java b/...src/main/java/org/phenotips/data/similarity/internal/RestrictedPatientSimilarityView.java
@@ -73,6 +73,12 @@ public RestrictedPatientSimilarityView(AbstractPatientSimilarityView openView)
         this(openView.match, openView.reference, openView.access);
     }
 
+    @Override
+    public String getId()
+    {
+        return this.access.isOpenAccess() ? this.match.getId() : null;
+    }
+
     @Override
     public String getExternalId()
     {