diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-11-08 22:08:41 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-11-08 22:08:41 -0200 |
| commit | 83467d7434dff6ab0d0f7b18e16a1d0442070bea (patch) | |
| tree | 71a3cadc550cdacd8cf9ab1dd833580b455913be | |
| parent | 36ebd374e0e9ab60aa66abd0dc3b6fbe28ed2351 (diff) | |
| download | muamba-83467d7434dff6ab0d0f7b18e16a1d0442070bea.tar.gz muamba-83467d7434dff6ab0d0f7b18e16a1d0442070bea.tar.bz2 | |
Refactoring muamba_availability_info()
| -rw-r--r-- | muamba.business.inc | 29 | ||||
| -rw-r--r-- | muamba.db.inc | 4 |
2 files changed, 22 insertions, 11 deletions
diff --git a/muamba.business.inc b/muamba.business.inc index d7de834..34dcf06 100644 --- a/muamba.business.inc +++ b/muamba.business.inc @@ -417,22 +417,31 @@ function muamba_widget($node, $size = 'small') { */ function muamba_availability_info($nid) { global $user; - $available = muamba_check_availability($nid); - $node = node_load($nid); + $available = muamba_check_availability($nid); + $node = node_load($nid); + $transaction = muamba_current_transactions($nid, $user->uid); if ($node->uid == $user->uid) { return t('You own the item'); } - elseif (!$available) { - $transaction = muamba_current_transactions($nid, $user->uid); - - if (isset($transaction['uid']) && $transaction['uid'] == $user->uid) { - return t('You requested'); + else { + if (!$available) { + if (isset($transaction['uid']) && $transaction['uid'] == $user->uid) { + return t('You requested, status is @status', array( + '@status' => muamba_statuses($transaction['status']) + )); + } + else { + return t('No'); + } } else { - return t('No'); + if (isset($transaction['uid']) && $transaction['uid'] == $user->uid) { + return t('Yes, you requested'); + } + else { + return t('Yes'); + } } } - - return t('Yes'); } diff --git a/muamba.db.inc b/muamba.db.inc index 5e3a403..4275dde 100644 --- a/muamba.db.inc +++ b/muamba.db.inc @@ -151,7 +151,9 @@ function muamba_current_transactions($data, $uid = NULL) { return $rows[0]; } - return $rows; + if (isset($rows)) { + return $rows; + } } /** |