Browse Source

Aggregator needed to be turned back on

spficklin 14 năm trước cách đây
mục cha
commit
c31f291cb7
1 tập tin đã thay đổi với 13 bổ sung13 xóa
  1. 13 13
      tripal_feature/tripal_feature.module

+ 13 - 13
tripal_feature/tripal_feature.module

@@ -1055,19 +1055,19 @@ function tripal_feature_load_featurelocs ($feature_id,$side = 'as_parent',$aggre
       $featurelocs[$i++] = $loc;
    }
 
-//   // Add the relationship feature locs if aggregate is turned on
-//   if($aggregate and strcmp($side,'as_parent')==0){ 
-//      // get the relationships for this feature without substituting any children
-//      // for the parent. We want all relationships
-//      $relationships = tripal_feature_get_aggregate_relationships($feature_id,0);
-//      foreach($relationships as $rindex => $rel){ 
-//         // get the featurelocs for each of the relationship features
-//         $rel_featurelocs = tripal_feature_load_featurelocs ($rel->subject_id,'as_child',0);
-//         foreach($rel_featurelocs as $findex => $rfloc){
-//            $featurelocs[$i++] = $rfloc;
-//         }
-//      }
-//   } 
+   // Add the relationship feature locs if aggregate is turned on
+   if($aggregate and strcmp($side,'as_parent')==0){ 
+      // get the relationships for this feature without substituting any children
+      // for the parent. We want all relationships
+      $relationships = tripal_feature_get_aggregate_relationships($feature_id,0);
+      foreach($relationships as $rindex => $rel){ 
+         // get the featurelocs for each of the relationship features
+         $rel_featurelocs = tripal_feature_load_featurelocs ($rel->subject_id,'as_child',0);
+         foreach($rel_featurelocs as $findex => $rfloc){
+            $featurelocs[$i++] = $rfloc;
+         }
+      }
+   } 
    
    usort($featurelocs,'tripal_feature_sort_locations');
    return $featurelocs;