cleanup

diff --git a/ipf/legacy_orm/app.php b/ipf/legacy_orm/app.php
index 8aa0019e82b7e04507cedf3e7ff86f5676f3059a..4cc34722a84aab8192c2f25cf82f9e09a5f2437a 100644 (file)
--- a/ipf/legacy_orm/app.php
+++ b/ipf/legacy_orm/app.php
@@ -39,7 +39,6 @@ class IPF_Legacy_ORM_App extends IPF_Application
     {
         return array(
             new IPF_Legacy_ORM_Command_BuildModels,
-            new IPF_Legacy_ORM_Command_BuildContribModels,
             new IPF_Legacy_ORM_Command_Sql,
             new IPF_Legacy_ORM_Command_SyncDB,
             new IPF_Legacy_ORM_Command_Fixtures,

diff --git a/ipf/legacy_orm/commands/buildcontribmodels.php b/ipf/legacy_orm/commands/buildcontribmodels.php
deleted file mode 100644 (file)
index 4ffd5f3..0000000
--- a/ipf/legacy_orm/commands/buildcontribmodels.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class IPF_Legacy_ORM_Command_BuildContribModels
-{
-    public $command = 'buildcontribmodels';
-    public $description = 'Build all contrib model classes';
-
-    public function run($args=null)
-    {
-        print "Build all contrib model classes\n";
-
-        $project = IPF_Project::getInstance();
-
-        $extraAllwedReferences = array();
-        foreach ($project->frameworkApps() as $app) {
-            $models = IPF_ORM::generateModelsFromYaml($app->path, $extraAllwedReferences);
-            $extraAllwedReferences = array_merge($extraAllwedReferences, $models);
-        }
-    }
-}
-

diff --git a/ipf/legacy_orm/commands/buildmodels.php b/ipf/legacy_orm/commands/buildmodels.php
index 0e2e9b895fd68558241d0c6b1404d95b448b9898..9dca874a3758dec1844ac214d230772596e97a87 100644 (file)
--- a/ipf/legacy_orm/commands/buildmodels.php
+++ b/ipf/legacy_orm/commands/buildmodels.php
@@ -12,19 +12,10 @@ class IPF_Legacy_ORM_Command_BuildModels
         $project = IPF_Project::getInstance();
 
         $paths = array();
-        foreach ($project->customApps() as $app)
+        foreach ($project->appList() as $app)
             $paths[] = $app->getPath();
 
-        $extraAllowedReferences = $this->frameworkModels($project);
-        IPF_ORM::generateModelsFromYaml($paths, $extraAllowedReferences);
-    }
-
-    private function frameworkModels($project)
-    {
-        $models = array();
-        foreach ($project->frameworkApps() as $app)
-            $models = array_merge($models, IPF_Legacy_ORM_App::appModelList($app));
-        return $models;
+        IPF_ORM::generateModelsFromYaml($paths, array());
     }
 }
 

diff --git a/ipf/legacy_orm/commands/fixtures.php b/ipf/legacy_orm/commands/fixtures.php
index 0b5689a3387a4d4fa095aeae0c15d39081e04d76..3c6e279291b49385090b02b015d2381e77995d94 100644 (file)
--- a/ipf/legacy_orm/commands/fixtures.php
+++ b/ipf/legacy_orm/commands/fixtures.php
@@ -12,7 +12,7 @@ class IPF_Legacy_ORM_Command_Fixtures
         $project = IPF_Project::getInstance();
 
         $paths = array(IPF::get('project_path'));
-        foreach ($project->customApps() as $app)
+        foreach ($project->appList() as $app)
             $paths[] = $app->path;
 
         $fixtures = array();

diff --git a/ipf/legacy_orm/commands/sql.php b/ipf/legacy_orm/commands/sql.php
index 5bc9c2d050761c7186d20ff5445db9dfebdf65de..31f55c9e3f13e0a682bf12de2497cb6c399cad7e 100644 (file)
--- a/ipf/legacy_orm/commands/sql.php
+++ b/ipf/legacy_orm/commands/sql.php
@@ -9,17 +9,8 @@ class IPF_Legacy_ORM_Command_Sql
     {
         print "Show all SQL DDL from model classes\n";
 
-        $project = IPF_Project::getInstance();
-
-        $sql = '';
-
-        foreach ($project->frameworkApps() as $app)
-            $sql .= IPF_ORM::generateSqlFromModels($app)."\n";
-
-        foreach ($project->customApps() as $app)
-            $sql .= IPF_ORM::generateSqlFromModels($app)."\n";
-
-        print $sql;
+        foreach (IPF_Project::getInstance()->appList() as $app)
+            print IPF_ORM::generateSqlFromModels($app)."\n";
     }
 }
 

diff --git a/ipf/legacy_orm/orm.php b/ipf/legacy_orm/orm.php
index 660c0a97f26ca69b451248b8b325a0e73004d6c6..f5fb91615a4874803f0d734f4e2df4c8dbce2592 100644 (file)
--- a/ipf/legacy_orm/orm.php
+++ b/ipf/legacy_orm/orm.php
@@ -243,5 +243,13 @@ final class IPF_ORM
 
         return implode("\n", $ret);
     }
+
+    public static function GetObjectOr404($object, $id)
+    {
+        $obj = IPF_ORM::getTable($object)->findOneById($id);
+        if ($obj)
+            return $obj;
+        throw new IPF_HTTP_Error404();
+    }
 }