소스 검색

Fixed a bug where the operation__analysis field was being added to the analysis content type because it has an analysis_id in it. That shouldn't happen

Stephen Ficklin 6 년 전
부모
커밋
6324eb4400
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      tripal_chado/includes/tripal_chado.fields.inc

+ 2 - 2
tripal_chado/includes/tripal_chado.fields.inc

@@ -567,7 +567,7 @@ function tripal_chado_bundle_fields_info_custom(&$info, $details, $entity_type,
   } 
 
   // Analysis Id
-  if (array_key_exists('analysis_id', $schema['fields'])) {
+  if (array_key_exists('analysis_id', $schema['fields']) and $table_name != 'analysis') {
     $field_name = 'operation__analysis';
     $field_type = 'operation__analysis';
     $info[$field_name] = array(
@@ -2164,7 +2164,7 @@ function tripal_chado_bundle_instances_info_custom(&$info, $entity_type, $bundle
     );
   } 
   // Analysis Id
-  if (array_key_exists('analysis_id', $schema['fields'])) {
+  if (array_key_exists('analysis_id', $schema['fields']) and $table_name != 'analysis') {
     $field_name = 'operation__analysis';
     $is_required = FALSE;
     if (array_key_exists('not null', $schema['fields']['analysis_id']) and