--- /Users/efarris/drupal-cvs/drupal/modules/node.module Tue Sep 21 16:01:18 2004 +++ node.module Mon Sep 27 17:57:19 2004 @@ -708,6 +708,13 @@ * Generate the content administration overview. */ function node_admin_nodes() { + + $type_filters = array(array(t('All types'), '')); + $result = db_query('SELECT DISTINCT type FROM {node} ORDER BY type'); + while ($nodetype = db_fetch_object($result)) { + $type_filters = array($nodetype->type, "WHERE type ='" . $nodetype->type . "' "); + } + $filters = array( array(t('View posts that are new or updated'), 'ORDER BY n.changed DESC'), array(t('View posts that need approval'), 'WHERE n.status = 0 OR n.moderate = 1 ORDER BY n.changed DESC'), @@ -735,6 +742,14 @@ if ($op == t('Filter') && isset($_POST['edit']['filter'])) { $_SESSION['node_overview_filter'] = $_POST['edit']['filter']; } + + if (empty($_SESSION['node_type_filter'])) { + $_SESSION['node_type_filter'] = 0; + } + + if (isset($_POST['edit']['type_filter'])) { + $_SESSION['node_type_filter'] = $_POST['edit']['type_filter']; + } if ($op == t('Update') && isset($_POST['edit']['operation']) && isset($_POST['edit']['status'])) { $operation = $operations[$_POST['edit']['operation']][1]; @@ -748,6 +763,7 @@ } $filter = $_SESSION['node_overview_filter']; + $type_filter = $_SESSION['node_type_filter']; // Render filter form: $options = array(); @@ -759,6 +775,21 @@ $form .= form_submit(t('Filter')); $output .= '