Fixes and message link

diff --git a/muamba.business.inc b/muamba.business.inc
index 1b40d1ba30bbe60bb72e96ece62c21aa2a0d005a..79fefd1243fa45a862187b46be2cbbefa380207e 100644 (file)
--- a/muamba.business.inc
+++ b/muamba.business.inc
@@ -26,20 +26,13 @@ function muamba_actions_available($type = 'sent', $status) {
     switch ($status) {
     case MUAMBA_REQUESTED:
       $actions = array(
-        MUAMBA_ACCEPTED,
-        MUAMBA_REJECTED,
+        MUAMBA_CANCELLED,
         );
       break;
 
     case MUAMBA_ACCEPTED:
       $actions = array(
-        MUAMBA_RELEASED,
-        );
-      break;
-
-    case MUAMBA_RETURNED:
-      $actions = array(
-        MUAMBA_RELEASED,
+        MUAMBA_RETURNED,
         );
       break;
 
@@ -51,13 +44,20 @@ function muamba_actions_available($type = 'sent', $status) {
     switch ($status) {
     case MUAMBA_REQUESTED:
       $actions = array(
-        MUAMBA_CANCELLED,
+        MUAMBA_ACCEPTED,
+        MUAMBA_REJECTED,
         );
       break;
 
     case MUAMBA_ACCEPTED:
       $actions = array(
-        MUAMBA_RETURNED,
+        MUAMBA_RELEASED,
+        );
+      break;
+
+    case MUAMBA_RETURNED:
+      $actions = array(
+        MUAMBA_RELEASED,
         );
       break;
 

diff --git a/muamba.theme.inc b/muamba.theme.inc
index 1bec871c30bfd9648958082387792fc536aed9b6..b2da534e07661ea18f8980b1589ac79c6a8d0adf 100644 (file)
--- a/muamba.theme.inc
+++ b/muamba.theme.inc
@@ -33,19 +33,20 @@ function theme_muamba_transactions($variables) {
   foreach($transactions as $transaction) {
     foreach (muamba_actions_available($type, $transaction['status']) as $action) {
       $callback  = muamba_actions($action);
-      $available_actions[] = l(t($callback), $callback);
+      $actions[] = l(t($callback), $callback);
     }
 
     $rows[] = array(
       'asset'   => $transaction['node']->title,
       'user'    => $transaction['user']->name,
       'status'  => t(muamba_statuses($transaction['status'])),
-      'available_actions' => implode($available_actions, '|'),
+      'actions' => implode($actions, ' | '),
+      'thread'  => l(t('view'), 'messages/view/'. $transaction['thread_id']),
     );
   }
 
   // Make a table for them.
-  $header = array(t('Asset'), t('User'), t('Status'), t('Actions'));
+  $header = array(t('Asset'), t('User'), t('Status'), t('Actions'), t('Messages'));
   $output .= theme('table', array('header' => $header, 'rows' => $rows));  
   $output .= '</div>';