From: Alan Knowles <alan@roojs.com>
Date: Thu, 22 May 2014 08:43:00 +0000 (+0800)
Subject: DatabaseColumns.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=ef38b47aadfb7770a73c89f1cc7c5bd74f17b91a

DatabaseColumns.php
---

diff --git a/DatabaseColumns.php b/DatabaseColumns.php
index b3068b58..4f22c1f4 100644
--- a/DatabaseColumns.php
+++ b/DatabaseColumns.php
@@ -24,16 +24,20 @@ class Pman_Core_DatabaseColumns extends Pman {
     
     function get($table) {
         $d = DB_DAtaObject::Factory($table);
-        $re = $d->autoJoin();
-        //echo '<PRE>';print_r($re);
-        $ret = array ();
-        
-        foreach($re['join_names'] as $c=>$f) {
-            $re['cols'][$c] = $f;
+        if (method_exists($d, 'availableColumns')) {
+            $cols = $d->availableColumns();
+        } else {
+            
+            $re = $d->autoJoin();
+            //echo '<PRE>';print_r($re);
+            $cols = $re['cols'] ;
+            
+            foreach($re['join_names'] as $c=>$f) {
+                $cols[$c] = $f;
+            }
         }
-        
-        
-        foreach($re['cols'] as $c=>$f) {
+            
+        foreach($cols as $c=>$f) {
             $ret[]  = array(
                 'name' => $c,
                 'val' => $f