--- ./casetracker.module.orig 2006-05-24 22:57:08.000000000 +0200 +++ ./casetracker.module 2006-05-24 22:55:35.000000000 +0200 @@ -453,12 +453,12 @@ array('data' => t('Edit')), array('data' => t('Add a case to this project'))); if ($argument == 'all_projects') { - $sql = db_rewrite_sql("SELECT n.*, cp.* FROM {node} n INNER JOIN {casetracker_project} cp on n.vid = cp.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s'"); + $sql = db_rewrite_sql("SELECT n.*, cp.* FROM {node} n INNER JOIN {casetracker_project} cp ON n.vid = cp.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.type ='%s'"); $arguments = array('casetracker_project'); } else { - $sql = db_rewrite_sql("SELECT n.*, cp.* FROM {node} n INNER JOIN {casetracker_project} cp on n.vid = cp.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.uid = %d AND n.type = '%s'"); + $sql = db_rewrite_sql("SELECT n.*, cp.* FROM {node} n INNER JOIN {casetracker_project} cp ON n.vid = cp.vid LEFT JOIN {node_comment_statistics} c ON c.nid = n.nid WHERE n.uid = %d AND n.type = '%s'"); $arguments = array($user->uid, 'casetracker_project'); } @@ -600,7 +600,10 @@ '#collapsed' => TRUE); $case_status_options = casetracker_case_state_option('status'); $keys = array_keys($case_status_options); - $result = db_query(db_rewrite_sql("SELECT * FROM {node} n WHERE n.type = 'casetracker_project'")); + // **EC replace the query with one looks for node types that act as project + // $result = db_query(db_rewrite_sql("SELECT * FROM {node} n WHERE n.type = 'casetracker_project'")); + $result = db_query(db_rewrite_sql("SELECT nid, title FROM {node} n WHERE n.type = 'casetracker_project' OR n.type IN (".str_pad('', count(variable_get('casetracker_project_node_types',array('casetracker_project'))) * 5 - 1, "'%s',")).")",variable_get('casetracker_project_node_types',array('casetracker_project'))); + while ($row = db_fetch_array($result)) { $project_options[$row['nid']] = $row['title']; } @@ -2714,7 +2717,8 @@ function casetracker_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) { switch ($op) { case 'view': - if(in_array($node->type, variable_get('casetracker_project_node_types',array('casetracker_project')))&& $node->type == 'casetracker_project'){ + // **EC replace '&&' by '||' + if(in_array($node->type, variable_get('casetracker_project_node_types',array('casetracker_project'))) || $node->type == 'casetracker_project'){ //casetracker_project_view1($node, $teaser = FALSE, $page = FALSE); //$node = node_prepare($node, $teaser); $output = '
';