Added a fix to the descriptor initialization

feup-infolab · Aug 2, 2017 · 173ab9d · 173ab9d
1 parent bc7ca45
commit 173ab9d
Showing 1 changed file with 26 additions and 25 deletions.
diff --git a/src/models/meta/descriptor.js b/src/models/meta/descriptor.js
@@ -95,6 +95,32 @@ function Descriptor(object, typeConfigsToRetain)
                 self.label = Elements[self.prefix][self.shortName].label;
                 self.comment = Elements[self.prefix][self.shortName].comment;
 
+
+                if(!isNull(object.label))
+                {
+                    self.label = object.label;
+                }
+                else
+                {
+                    self.label = Elements[self.prefix][self.shortName].label;
+                }
+
+                if(!isNull(object.comment))
+                {
+                    self.comment = object.comment;
+                }
+                else
+                {
+                    self.comment = Elements[self.prefix][self.shortName].comment;
+                }
+
+                //override type if supplied in object argument
+
+                if(!isNull(object.type))
+                {
+                    self.type = object.type;
+                }
+
                 if(!isNull(Elements[self.prefix][self.shortName].hasAlternative))
                 {
                     self.hasAlternative = Elements[self.prefix][self.shortName].hasAlternative;
@@ -125,31 +151,6 @@ function Descriptor(object, typeConfigsToRetain)
                 }
             }
 
-            if(!isNull(object.label))
-            {
-                self.label = object.label;
-            }
-            else
-            {
-                self.label = Elements[self.prefix][self.shortName].label;
-            }
-
-            if(!isNull(object.comment))
-            {
-                self.comment = object.comment;
-            }
-            else
-            {
-                self.comment = Elements[self.prefix][self.shortName].comment;
-            }
-
-            //override type if supplied in object argument
-
-            if(!isNull(object.type))
-            {
-                self.type = object.type;
-            }
-
             self.setValue(object.value);
 
             //try to get parametrization from ontology level