diff -r -u -F '^function' cvslog/cvs.module cvslog_mod/cvs.module --- cvslog/cvs.module 2007-06-19 19:27:24.000000000 -0400 +++ cvslog_mod/cvs.module 2007-07-12 10:09:08.000000000 -0400 @@ -2317,9 +2317,9 @@ function theme_cvs_project_access_form($ $node = node_load($nid); drupal_set_title(t('CVS access for %title', array('%title' => $node->title))); - project_project_set_breadcrumb($node, TRUE); - - $output = '
' . t("This page controls CVS access for the %title project. All users listed in this table have permission to commit and tag files in this project's directory in the CVS repository (%cvs_dir). The project owner is listed first and always has full access.", array('%cvs_dir' => '/contributions' . $node->cvs_directory, '%title' => $node->title)) . '
'; + project_project_set_breadcrumb($node, TRUE); + + $output = '' . t("This page controls CVS access for the %title project. Unless otherwise indicated, all users listed in this table have permission to commit and tag files in this project's directory in the CVS repository (%cvs_dir). The project owner is listed first and always has full access.", array('%cvs_dir' => '' . $node->cvs_directory, '%title' => $node->title)) . '
'; $rows = array(); $header = array(); @@ -2330,11 +2330,16 @@ function theme_cvs_project_access_form($ // user as the first row in the table, and don't allow any operations. $rows[] = array(theme('username', $node), ''. t('locked') .''); - - $maintainers = db_query("SELECT u.name, u.uid FROM {users} u INNER JOIN {cvs_project_maintainers} cpm ON u.uid = cpm.uid WHERE cpm.nid = %d" . tablesort_sql($header), $nid); + $maintainers = db_query("SELECT u.name, u.uid, ca.status FROM {users} u INNER JOIN {cvs_project_maintainers} cpm ON u.uid = cpm.uid INNER JOIN {cvs_accounts} ca ON u.uid = ca.uid WHERE cpm.nid = %d" . tablesort_sql($header), $nid); while ($user = db_fetch_object($maintainers)) { - $rows[] = array(theme('username', $user), - l(t('delete'), "node/$nid/cvs-access/delete/$user->uid")); + // indicate any maintainers that have CVS accounts but with status != CVS_APPROVED + if ($user->status != CVS_APPROVED) { + $username = '