? storm--918748-11.patch ? storm_expense_simple_test_2.patch ? storm_team_simple_test_3.patch ? stormteam/stormteam.test Index: stormexpense/stormexpense.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormexpense/stormexpense.module,v retrieving revision 1.4.4.40 diff -u -p -r1.4.4.40 stormexpense.module --- stormexpense/stormexpense.module 11 Oct 2010 15:40:13 -0000 1.4.4.40 +++ stormexpense/stormexpense.module 17 Jan 2011 23:58:50 -0000 @@ -307,16 +307,16 @@ function stormexpense_form(&$node) { } } - if ($_SESSION['stormexpense_list_filter']['organization_nid'] && !$node->organization_nid) { + if (isset($_SESSION['stormexpense_list_filter']['organization_nid']) && (!isset($node->organization_nid))) { $node->organization_nid = $_SESSION['stormexpense_list_filter']['organization_nid']; } - if ($_SESSION['stormexpense_list_filter']['project_nid'] && !$node->project_nid) { + if (isset($_SESSION['stormexpense_list_filter']['project_nid']) && (!isset($node->project_nid))) { $node->project_nid = $_SESSION['stormexpense_list_filter']['project_nid']; } - if ($_SESSION['stormexpense_list_filter']['task_nid'] && !$node->task_nid) { + if (isset($_SESSION['stormexpense_list_filter']['task_nid']) && (!isset($node->task_nid))) { $node->task_nid = $_SESSION['stormexpense_list_filter']['task_nid']; } - if ($_SESSION['stormexpense_list_filter']['ticket_nid'] && !$node->ticket_nid) { + if (isset($_SESSION['stormexpense_list_filter']['ticket_nid']) && (!isset($node->ticket_nid))) { $node->ticket_nid = $_SESSION['stormexpense_list_filter']['ticket_nid']; } if (array_key_exists('organization_nid', $_GET)) $node->organization_nid = $_GET['organization_nid']; @@ -359,9 +359,13 @@ function stormexpense_form(&$node) { $s_org = db_rewrite_sql($s_org); $r = db_query($s_org); $organizations = array(); - while ($organization = db_fetch_object($r)) { - $organizations[$organization->nid] = $organization->title; - if (!$node->organization_nid) $node->organization_nid = $organization->nid; + if ($r->num_rows > 0) { + while ($organization = db_fetch_object($r)) { + $organizations[$organization->nid] = $organization->title; + if (!isset($node->organization_nid)) { + $node->organization_nid = $organization->nid; + } + } } $form['group1']['organization_nid'] = array( '#type' => 'select', @@ -385,19 +389,19 @@ function stormexpense_form(&$node) { $form['group1']['project_nid'] = array( '#type' => 'select', '#title' => t('Project'), - '#default_value' => $node->project_nid, + '#default_value' => isset($node->project_nid) ? $node->project_nid : NULL, '#options' => $projects, '#process' => array('storm_dependent_select_process'), '#attributes' => array('onchange' => "stormticket_project_task_tickets(this, 'edit-organization-nid', 'edit-task-nid', 'edit-ticket-nid', true, '-')"), ); - - $tree = _stormtask_get_tree($node->project_nid); + + $tree = isset($node->project_nid) ? _stormtask_get_tree($node->project_nid) : 0; $tasks = _stormtask_plain_tree($tree); $tasks = array(0 => '-') + $tasks; $form['group1']['task_nid'] = array( '#type' => 'select', '#title' => t('Task'), - '#default_value' => $node->task_nid, + '#default_value' => (isset($node->task_nid)) ? $node->task_nid : NULL, '#options' => $tasks, '#process' => array('storm_dependent_select_process'), '#attributes' => array('onchange' => "stormticket_task_tickets(this, 'edit-organization-nid', 'edit-project-nid', 'edit-ticket-nid', true, '-')"), @@ -408,14 +412,16 @@ function stormexpense_form(&$node) { AND sti.organization_nid=%d AND sti.project_nid=%d AND sti.task_nid=%d ORDER BY n.title"; $s = stormticket_access_sql($s); $s = db_rewrite_sql($s); - $r = db_query($s, $node->organization_nid, $node->project_nid, $node->task_nid); + if (isset($node->organization_nid) && (isset($node->project_nid))) { + $r = db_query($s, $node->organization_nid, $node->project_nid, $node->task_nid); + } while ($ticket = db_fetch_object($r)) { $tickets[$ticket->nid] = $ticket->title; } $form['group1']['ticket_nid'] = array( '#type' => 'select', '#title' => t('Ticket'), - '#default_value' => $node->ticket_nid, + '#default_value' => (isset($node->ticket_nid)) ? $node->ticket_nid : NULL, '#options' => array(0 => '-') + $tickets, '#process' => array('storm_dependent_select_process'), ); @@ -436,7 +442,7 @@ function stormexpense_form(&$node) { '#type' => 'textfield', '#title' => t('Provider'), '#size' => 50, - '#default_value' => $node->provider_title, + '#default_value' => (isset($node->provider_title)) ? $node->provider_title : NULL, '#autocomplete_path' => 'storm/expenses/provider_autocomplete', ); @@ -449,7 +455,7 @@ function stormexpense_form(&$node) { $form['group3']['amount'] = array( '#type' => 'textfield', '#title' => t('Amount'), - '#default_value' => $node->amount, + '#default_value' => (isset($node->amount)) ? $node->amount : NULL, '#size' => 15, ); @@ -536,9 +542,9 @@ function stormexpense_insert($node) { %d, '%s', '%s', %d, '%s', %d, '%s', %d, %f, %d, %f, %f, %f, %d, %f, %f, %f)", - $node->vid, $node->nid, $node->organization_nid, $node->organization_title, $node->project_nid, $node->project_title, - $node->task_nid, $node->task_title, $node->task_stepno, $node->ticket_nid, $node->ticket_title, - $node->provider_nid, $node->provider_title, $node->expensedate, $node->amount, $node->tax1app, $node->tax1percent, + $node->vid, $node->nid, $node->organization_nid, $node->organization_title, $node->project_nid, (isset($node->project_title)) ? $node->project_title : NULL, + (isset($node->task_nid)) ? $node->task_nid : NULL, (isset($node->task_title)) ? $node->task_title : NULL, (isset($node->task_stepno)) ? $node->task_stepno : NULL, $node->ticket_nid, (isset($node->ticket_title)) ? $node->ticket_title : NULL, + (isset($node->provider_nid)) ? $node->provider_nid : NULL, $node->provider_title, $node->expensedate, $node->amount, $node->tax1app, $node->tax1percent, $node->tax1, $node->subtotal, $node->tax2app, $node->tax2percent, $node->tax2, $node->total); } @@ -552,11 +558,11 @@ function stormexpense_update($node) { db_query("UPDATE {stormexpense} SET organization_nid=%d, organization_title='%s', project_nid=%d, project_title='%s', task_nid=%d, task_title='%s', task_stepno='%s', ticket_nid=%d, ticket_title='%s', - provider_nid=%d, provider_title='%s', expensedate=%d, amount=%f, tax1app=%d, tax1percent=%f, + provider_nid=%d, provider_title='%s', expensedate=%d, amount=%f, tax1app=%d, tax1percent=%f, tax1=%f, subtotal=%f, tax2app=%d, tax2percent=%f, tax2=%f, total=%f WHERE vid = %d", $node->organization_nid, $node->organization_title, $node->project_nid, $node->project_title, $node->task_nid, $node->task_title, $node->task_stepno, $node->ticket_nid, $node->ticket_title, - $node->provider_nid, $node->provider_title, $node->expensedate, $node->amount, $node->tax1app, $node->tax1percent, + $node->provider_nid, $node->provider_title, $node->expensedate, $node->amount, $node->tax1app, $node->tax1percent, $node->tax1, $node->subtotal, $node->tax2app, $node->tax2percent, $node->tax2, $node->total, $node->vid); } } @@ -583,18 +589,25 @@ function _stormexpense_beforesave(&$node WHERE type='stormproject' AND n.nid=%d"; $r = db_query($s, $node->project_nid); $p = db_fetch_object($r); - $node->project_title = $p->title; + + $node->project_title = isset($p->title) ? $p->title : ''; $s = "SELECT title, stepno FROM {node} AS n INNER JOIN {stormtask} AS t ON n.vid=t.vid WHERE n.type='stormtask' AND n.nid=%d"; - $r = db_query($s, $node->task_nid); + if (isset($node->task_nid)) { + $r = db_query($s, $node->task_nid); + } $ta = db_fetch_object($r); - $node->task_title = $ta->title; - $node->task_stepno = $ta->stepno; + + $node->task_title = isset($ta->title) ? $ta->title : ''; + $node->task_stepno = isset($ta->stepno) ? $ta->stepno : ''; $s = "SELECT title FROM {node} AS n INNER JOIN {stormticket} AS t ON n.vid=t.vid WHERE n.type='stormticket' AND n.nid=%d"; - $r = db_query($s, $node->ticket_nid); + if (isset($node->ticket_nid)) { + $r = db_query($s, $node->ticket_nid); + } $ti = db_fetch_object($r); - $node->ticket_title = $ti->title; + + $node->ticket_title = isset($ti->title) ? $ti->title : ''; } function stormexpense_nodeapi(&$node, $op, $teaser, $page) { Index: stormexpense/stormexpense.test =================================================================== RCS file: stormexpense/stormexpense.test diff -N stormexpense/stormexpense.test --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ stormexpense/stormexpense.test 17 Jan 2011 23:58:50 -0000 @@ -0,0 +1,38 @@ + t('Storm Expense Functionality'), + 'description' => t('Test the functionality of the Storm Expense module'), + 'group' => 'Storm', + ); + } + + public function setUp() { + parent::setUp('storm', 'stormattribute', 'stormorganization', 'stormproject', 'stormtask', 'stormticket', 'stormexpense'); + } + + public function testStormexpenseCreate() { + // Create and login user + $user = $this->drupalCreateUser(array('Storm organization: add', 'Storm organization: view all', 'Storm expense: add', 'Storm expense: view all', 'Storm project: view all', 'Storm task: view all')); + $this->drupalLogin($user); + + // Create an expense + $org = array( + 'title' => $this->randomName(32), + ); + + $expense = array( + 'organization_nid' => '1', + 'title' => $this->randomName(32), + ); + + $this->drupalPost('node/add/stormorganization', $org, t('Save')); + + $this->drupalPost('node/add/stormexpense', $expense, t('Save')); + + $this->assertText(t('Expense @title has been created.', array('@title' => $expense['title']))); + } +} +