Index: stormtask/stormtask.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormtask/stormtask.admin.inc,v
retrieving revision 1.8.4.29
diff -u -p -r1.8.4.29 stormtask.admin.inc
--- stormtask/stormtask.admin.inc	14 Dec 2009 23:37:26 -0000	1.8.4.29
+++ stormtask/stormtask.admin.inc	24 Dec 2009 06:09:52 -0000
@@ -443,6 +443,10 @@ function stormtask_list() {
       'field' => 'n.title',
     ),
     array(
+      'data' => t('Assigned'),
+      'field' => 'sta.assigned_title',
+    ),
+    array(
       'data' => t('Category'),
       'field' => 'sta.taskcategory',
     ),
@@ -475,6 +479,11 @@ function stormtask_list() {
     $args[] = $_SESSION['stormtask_list_filter']['project_nid'];
     $filterfields[] = 'Project';
   }
+  if ($_SESSION['stormtask_list_filter']['assigned_nid']) {
+    $where[] = 'sta.assigned_nid=%d';
+    $args[] = $_SESSION['stormtask_list_filter']['assigned_nid'];
+    $filterfields[] = 'Assigned';
+  }
   if ($_SESSION['stormtask_list_filter']['taskcategory'] && $_SESSION['stormtask_list_filter']['taskcategory'] != '-') {
     $category = split(',', $_SESSION['stormtask_list_filter']['taskcategory']);
     $v = array();
@@ -610,6 +619,7 @@ function stormtask_list_filter(&$form_st
 
   $organization_nid = $_SESSION['stormtask_list_filter']['organization_nid'];
   $project_nid = $_SESSION['stormtask_list_filter']['project_nid'];
+  $assigned_nid = $_SESSION['stormtask_list_filter']['assigned_nid'];
 
   $datebeginfrom = $_SESSION['stormtask_list_filter']['datebeginfrom'];
   $datebeginto = $_SESSION['stormtask_list_filter']['datebeginto'];
@@ -651,7 +661,7 @@ function stormtask_list_filter(&$form_st
     '#title' => t('Organization'),
     '#default_value' => $organization_nid,
     '#options' => $organizations,
-    '#attributes' => array('onchange' => "stormproject_organization_projects(this, 'edit-project-nid', true, 'All')"),
+    '#attributes' => array('onchange' => "stormproject_organization_projects(this, 'edit-project-nid', true, 'All');stormperson_organization_people(this, 'edit-assigned-nid', true, 'All')"),
   );
 
   $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormproject} AS spr ON spr.vid=n.vid
@@ -672,6 +682,24 @@ function stormtask_list_filter(&$form_st
     '#process' => array('storm_dependent_select_process'),
   );
 
+  $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormperson} AS spe ON spe.vid=n.vid
+  WHERE n.status=1 AND spe.organization_nid=%d AND n.type='stormperson' ORDER BY n.title";
+  $s = stormproject_access_sql($s);
+  $s = db_rewrite_sql($s);
+  $r = db_query($s, $organization_nid);
+  $people = array();
+  while ($person = db_fetch_object($r)) {
+    $people[$person->nid] = $person->title;
+  }
+  $people = array(0 => t('All')) + $people;
+  $form['filter']['group1']['assigned_nid'] = array(
+    '#type' => 'select',
+    '#title' => t('Assigned'),
+    '#default_value' => $assigned_nid,
+    '#options' => $people,
+    '#process' => array('storm_dependent_select_process'),
+  );
+
   $form['filter']['group2'] = array(
     '#type' => 'markup',
     '#theme' => 'storm_form_group',
@@ -768,6 +796,7 @@ function stormtask_list_filter(&$form_st
 function stormtask_list_filter_filter($form, &$form_state) {
   $_SESSION['stormtask_list_filter']['organization_nid'] = $form_state['values']['organization_nid'];
   $_SESSION['stormtask_list_filter']['project_nid'] = $form_state['values']['project_nid'];
+  $_SESSION['stormtask_list_filter']['assigned_nid'] = $form_state['values']['assigned_nid'];
   $_SESSION['stormtask_list_filter']['taskcategory'] = $form_state['values']['taskcategory'];
   $_SESSION['stormtask_list_filter']['taskstatus'] = $form_state['values']['taskstatus'];
   $_SESSION['stormtask_list_filter']['taskpriority'] = $form_state['values']['taskpriority'];
Index: stormtask/stormtask.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormtask/stormtask.theme.inc,v
retrieving revision 1.3.4.21
diff -u -p -r1.3.4.21 stormtask.theme.inc
--- stormtask/stormtask.theme.inc	19 Dec 2009 00:00:55 -0000	1.3.4.21
+++ stormtask/stormtask.theme.inc	24 Dec 2009 06:09:53 -0000
@@ -65,6 +65,7 @@ function theme_stormtask_list($header, $
       l($task->organization_title, 'node/'. $task->organization_nid),
       l($task->project_title, 'node/'. $task->project_nid),
       l($task->title, 'node/'. $task->nid) . theme('mark', node_mark($task->nid, $task->changed)),
+      l($task->assigned_title, 'node/'. $task->assigned_nid),
       storm_icon('category_'. $task->taskcategory, $task->taskcategory),
       storm_icon('status_'. $task->taskstatus, $task->taskstatus),
       storm_icon('priority_'. $task->taskpriority, $task->taskpriority),
@@ -170,4 +171,5 @@ function theme_stormtask_view($node, $te
   unset($node->content['body']);
 
   return $node;
-}
\ No newline at end of file
+}
+