SSDM-3529: bugs fixed.

SVN: 36463

openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/PropertyAssignment.js

@@ -19,6 +19,9 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
 			this.propertyType = propertyType;
 		};
 		prototype.getVocabularyFetchOptions = function() {
+			if (this.propertyType == null) {
+				return null;
+			}
 			return this.propertyType.getVocabularyFetchOptions();
 		}
 		prototype.getVocabulary = function() {

openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/PropertyType.js

@@ -48,7 +48,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
 			this.vocabularyFetchOptions = vocabularyFetchOptions;
 		};
 		prototype.getVocabulary = function() {
-			if (this.getVocabularyFetchOptions() && this.getVocabularyFetchOptions().hasVocabulary()) {
+			if (this.getVocabularyFetchOptions()) {
 				return this.vocabulary;
 			} else {
 				throw new exceptions.NotFetchedException("Vocabulary has not been fetched.");
@@ -58,7 +58,7 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
 			this.vocabulary = vocabulary;
 		};
 	}, {
-		vocabularyFetchOptions : "VocabularyTermFetchOptions",
+		vocabularyFetchOptions : "VocabularyFetchOptions",
 		vocabulary : "Vocabulary",
 		dataTypeCode : "DataTypeCode"
 	});

openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyAssignment.java

@@ -18,6 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.property;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.Vocabulary;
@@ -59,11 +60,13 @@ public class PropertyAssignment implements Serializable
         this.propertyType = propertyType;
     }
 
+    @JsonIgnore
     public VocabularyFetchOptions getVocabularyFetchOptions()
     {
         return propertyType.getVocabularyFetchOptions();
     }
     
+    @JsonIgnore
     public Vocabulary getVocabulary()
     {
         if (getVocabularyFetchOptions() != null)

openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyType.java

@@ -18,6 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.property;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
@@ -116,6 +117,7 @@ public class PropertyType implements ICodeHolder, Serializable
         this.vocabularyFetchOptions = fetchOptions;
     }
     
+    @JsonIgnore
     public Vocabulary getVocabulary()
     {
         if (getVocabularyFetchOptions() != null)