Form changes in project_issue for D6.

project_issue_extend.module

@@ -1,5 +1,5 @@
 <?php
-// $Id: project_issue_extend.module,v 1.2 2009-12-03 21:35:05 fgm Exp $
+// $Id: project_issue_extend.module,v 1.2.2.1 2009-12-03 22:40:32 fgm Exp $
 /**
  * A small module to assign issues to users
  * Derived from Nedjo Rogers' module for 4.7
@@ -41,16 +41,16 @@ function project_issue_extend_perm() {
 function project_issue_extend_form_alter(&$form, $form_state, $form_id) {
   if (in_array($form_id, array('project_issue_node_form', 'comment_form', /* was 'project_comment_form' */))
     && user_access(PROJECT_ISSUE_PERM_SETTER)) {
-    $options = array();
-    $result = db_query(
-        "SELECT DISTINCT u.uid, u.name "
-      . "FROM {users} u "
-      . "  INNER JOIN {users_roles} ur ON u.uid  = ur.uid "
-      . "  INNER JOIN {role}        r  ON ur.rid = r.rid "
-      . "  INNER JOIN {permission}  p  ON p.rid  = r.rid "
-      . "WHERE p.perm LIKE '%%%s%%' "
-      . "ORDER BY u.name",
-      PROJECT_ISSUE_PERM_GETTER);
+    $options = array(0 => t('Unassigned'));
+    $sq = "SELECT DISTINCT u.uid, u.name "
+        . "FROM {users} u "
+        . "  INNER JOIN {users_roles} ur ON u.uid  = ur.uid "
+        . "  INNER JOIN {role}        r  ON ur.rid = r.rid "
+        . "  INNER JOIN {permission}  p  ON p.rid  = r.rid "
+        . "WHERE u.status = 1 AND p.perm LIKE '%%%s%%' "
+        . "ORDER BY u.name";
+    $sq = db_rewrite_sql($sq, 'u', 'uid');
+    $result = db_query($sq, PROJECT_ISSUE_PERM_GETTER);
     while ($user = db_fetch_object($result)) {
       $options[$user->uid] = $user->name;
     }
@@ -58,12 +58,12 @@ function project_issue_extend_form_alter(&$form, $form_state, $form_id) {
     switch ($form_id) {
       case 'project_issue_node_form':
         if ($form['issue_info']['assigned']) {
-          $form['issue_info']['assigned']['#options'] += $options;
+          $form['issue_info']['assigned']['#options'] = $options;
         }
         break;
       case 'comment_form': // project_comment_form
-        if ($form['original_issue']['issue_info']['assigned']) {
-          $form['original_issue']['issue_info']['assigned']['#options'] += $options;
+        if ($form['original_issue']['project_info']['assigned']) {
+          $form['original_issue']['project_info']['assigned']['#options'] = $options;
         }
         break;
     }