Index: modr8_admin.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/modr8/modr8_admin.inc,v retrieving revision 1.2.2.6 diff -u -p -r1.2.2.6 modr8_admin.inc --- modr8_admin.inc 15 Jan 2007 00:30:14 -0000 1.2.2.6 +++ modr8_admin.inc 2 Mar 2007 04:56:09 -0000 @@ -151,6 +151,18 @@ function modr8_form($result = NULL) { '#type' => 'value', '#value' => node_get_types('name', $node), ); + + if(module_exists('taxonomy')) { + // taxonomy moderation + $taxonomy_subform = array( + '#node' => $node, + 'type' => array('#value' => $node->type), + ); + taxonomy_form_alter($node->type . '_node_form', $taxonomy_subform); + unset($taxonomy_subform['type']); + $form[$node->nid]['taxonomy'] = $taxonomy_subform; + } + } $form['submit'] = array( '#type' => 'submit', @@ -176,7 +188,7 @@ function theme_modr8_form(&$form) { $note_field = drupal_render($form[$key]['note']); } $row[] = array( - 'data' => drupal_render($form[$key]['ops']) . $note_field, + 'data' => drupal_render($form[$key]['ops']) . drupal_render($form[$key]['taxonomy']) . $note_field, 'style' => 'vertical-align:top;' ); $preview = $form[$key]['preview']['#value']; @@ -202,6 +214,7 @@ function theme_modr8_form(&$form) { */ function modr8_form_submit($form_id, $form_values) { foreach ($form_values as $nid => $values) { + dprint_r($values); $message = ''; switch ($values['ops']) { case 'approve': @@ -210,6 +223,11 @@ function modr8_form_submit($form_id, $fo } db_query('UPDATE {node} SET moderate = 0 WHERE nid = %d', $nid); drupal_set_message(t('The %type with title %title has been approved.', array('%title' => $values['title'], '%type' => $values['type']))); + + if(module_exists('taxonomy')) { + taxonomy_node_save($nid, $values['taxonomy']['taxonomy']); + } + cache_clear_all(); modr8_log_action('approve', $nid, $values, $message); break;