anarcat

cvs diff: Diffing .Index: decisions.install===================================================================RCS file: /cvs/drupal-contrib/contributions/modules/decisions/decisions.install,vretrieving revision 1.18diff -u -r1.18 decisions.install--- decisions.install   31 Oct 2006 04:00:29 -0000      1.18+++ decisions.install   31 Oct 2006 04:33:32 -0000@@ -54,6 +54,7 @@     $items[] = update_sql("ALTER TABLE {decisions} ADD COLUMN showvotes TINYINT DEFAULT '1'");     break;   }+  return $items; } function decisions_update_2() {@@ -61,8 +62,8 @@   case 'mysql':   case 'mysqli':     $items[] = update_sql("ALTER TABLE {decisions} ADD COLUMN startdate INT unsigned");-    $items[] = update_sql("ALTER TABLE {decisions} CHANGE COLUMN chtext `label` text NOT NULL");-    $items[] = update_sql("ALTER TABLE {decisions} CHANGE COLUMN chorder `vote_offset` int(2) default NULL");+    $items[] = update_sql("ALTER TABLE {decisions_choices} CHANGE COLUMN chtext `label` text NOT NULL");+    $items[] = update_sql("ALTER TABLE {decisions_choices} CHANGE COLUMN chorder `vote_offset` int(2) default NULL");     break;   }   return $items;Index: decisions.module===================================================================RCS file: /cvs/drupal-contrib/contributions/modules/decisions/decisions.module,vretrieving revision 1.113diff -u -r1.113 decisions.module--- decisions.module    31 Oct 2006 03:54:32 -0000      1.113+++ decisions.module    31 Oct 2006 04:33:33 -0000@@ -651,10 +651,8 @@ /**  * Implementation of hook_view().  */-function decisions_view(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) {-  if (!$block) {-    $node = node_prepare($node, $teaser);-  }+function decisions_view(&$node, $teaser = FALSE, $page = FALSE) {+  $node = node_prepare($node, $teaser);   $mode = _decisions_get_mode($node);   // Record the vote if they voted@@ -673,35 +671,30 @@   // Previewing a node, so don't show results   if ($node->in_preview) {     // Show the voting form but don't let them vote-    $output .= decisions_view_voting($node, $teaser, $page, $block);+    $output .= decisions_view_voting($node, $teaser, $page, false);   }   else if (!$node->voted && arg(2) != 'results' && $node->active && decisions_eligible($node)) {     // User hasn't voted and we're not on the results tab     if (!$valid) {-      $output .= decisions_view_voting($node, $teaser, $page, $block);+      $output .= decisions_view_voting($node, $teaser, $page, false);       $output .= decisions_view_electoral_list($node, $teaser);     }   }   else if (_decisions_can_view_results($node)) {     // show results only if the user has voted or decision is closed-    $output .= decisions_view_results($node, $teaser, $page, $block);+    $output .= decisions_view_results($node, $teaser, $page, false);     $output .= decisions_view_electoral_list($node, $teaser);   }-  if (isset($node->voted) && $node->voted && user_access('cancel own vote') && $node->active && !$block) {+  if (isset($node->voted) && $node->voted && user_access('cancel own vote') && $node->active) {     $output .= drupal_get_form('decisions_cancel', decisions_cancel_form($node->nid));   }-  if ($block) {-    $output = '<div class="title">' . $node->title . '</div>' . $output;-    $output .= l(t('view decision'), 'node/' . $node->nid);-    return $output;-  }-  else {-    $node->body .= $output;-    $node->teaser .= $output;-  }-+  $node->body .= $output;+  $node->teaser .= $output;+  print "node body: " . $node->body;+  print "node teaser: " . $node->teaser;+  return $node; } function decisions_view_electoral_list($node, $teaser = FALSE) {@@ -771,7 +764,7 @@   $mode = _decisions_get_mode($node);   if (function_exists("decisions_view_voting_$mode")) {-    return call_user_func("decisions_view_voting_$mode", $node, $teaser, $page, $block);+    return drupal_get_form("decisions_view_voting_$mode", $node, $teaser, $page, $block);   }   else {     _decisions_panic_on_mode($mode);cvs diff: Diffing modesIndex: modes/poll.inc===================================================================RCS file: /cvs/drupal-contrib/contributions/modules/decisions/modes/poll.inc,vretrieving revision 1.10diff -u -r1.10 poll.inc--- modes/poll.inc      31 Oct 2006 01:23:46 -0000      1.10+++ modes/poll.inc      31 Oct 2006 04:33:33 -0000@@ -63,7 +63,7 @@                         '#value' => t('Vote')                         );   $form['#action'] = url('node/'. $node->nid);-  return drupal_get_form('decisions_view_voting', $form);+  return $form; } /**Index: modes/ranking.inc===================================================================RCS file: /cvs/drupal-contrib/contributions/modules/decisions/modes/ranking.inc,vretrieving revision 1.15diff -u -r1.15 ranking.inc--- modes/ranking.inc   31 Oct 2006 01:23:46 -0000      1.15+++ modes/ranking.inc   31 Oct 2006 04:33:33 -0000@@ -81,7 +81,7 @@   }   $form['#action'] = url('node/'. $node->nid);-  return drupal_get_form('decisions_view_voting', $form);+  return $form; } /**anarcat@orange:/var/www/drupal/contributions/modules/decisions$