Changeset 154

Timestamp:

10/19/09 12:07:00 (1 month ago)

Author:

malko

Message:

- new modelCollection::isEmpty() method

Files:

• trunk/class-abstractmodel.php (modified) (5 diffs)

trunk/class-abstractmodel.php

@@ -12 +12 @@
 *            - $HeadURL$
 * @changelog
+*            - 2009-10-01 - new modelCollection::isEmpty() method
 *            - 2009-09-29 - bug correction in modelCollection::__get() when getting hasOne relation on foreign unique key
 *            - 2009-07-08 - new modelCollection::slice() method
@@ -330 +331 @@
                         return $chaining?$this:self::init($this->collectionType);
                 $temps = $this->getTemporaries();
-                $this->remove($temps);
+                $this->remove($temps->keys());
                 return $chaining?$this:$temps;
         }
@@ -630 +631 @@
         }
 
+        /** check the collection is empty */
+        function isEmpty(){
+                return ($this->count()>0)?false:true;
+        }
         /** return current model in collection @return abstractModel or null */
         function current(){
@@ -1266 +1271 @@
                 if( $modelName instanceof abstractModel)
                         $modelName=$modelName->modelName;
-                $collection = modelCollection::init($modelName);
-                foreach(self::$instances as $instance){
-                        if( $instance instanceof $modelName )
-                                $collection[] = $model;
-                }
-                return $collection;
+                return modelCollection::init($modelName,empty(self::$instances[strtolower($modelName)])?null:self::$instances[strtolower($modelName)]);
         }
 
@@ -1564 +1564 @@
                                 $tmpModel = self::getModelInstance($relDef['modelName'],$localFieldVal);
                         }
-                        if($tmpModel === false) # no related object was found in database create a new one
+                        if(! $tmpModel instanceof abstractModel) # no related object was found in database create a new one
                                 $tmpModel = self::getModelInstance($relDef['modelName']);
                         return $this->_oneModels[$relName] = $tmpModel;