Changeset 24620

Timestamp:

12/01/09 00:38:19 (3 years ago)

Author:

Kris.Wallsmith

Message:

[1.3, 1.4] fixed module option being ignored in *:generate-admin task (closes #5572, #6773)

Files:

• branches/1.3/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php (modified) (2 diffs)
• branches/1.3/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateAdminTask.class.php (modified) (3 diffs)
• branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php (modified) (2 diffs)
• branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateAdminTask.class.php (modified) (3 diffs)

branches/1.3/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php

@@ -102 +102 @@
-    $name = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $model));
-
+    if (isset($options['module']))
+    {
+      $route = $this->getRouteFromName($name);
+      if ($route && !$this->checkRoute($route, $model, $options['module']))
+      {
+        $name .= '_'.$options['module'];
+      }
+    }
+
-    $routing = sfConfig::get('sf_app_config_dir').'/routing.yml';
-    $content = file_get_contents($routing);
@@ -178 +187 @@
-    return false;
-  }
+
+  /**
+   * Checks whether a route references a model and module.
+   *
+   * @param mixed  $route  A route collection
+   * @param string $model  A model name
+   * @param string $module A module name
+   *
+   * @return boolean
+   */
+  protected function checkRoute($route, $model, $module)
+  {
+    if ($route instanceof sfDoctrineRouteCollection)
+    {
+      $options = $route->getOptions();
+      return $model == $options['model'] && $module == $options['module'];
+    }
+
+    return false;
+  }
-}

branches/1.3/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateAdminTask.class.php

@@ -102 +102 @@
-    $name = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $model));
-
+    if (isset($options['module']))
+    {
+      $route = $this->getRouteFromName($name);
+      if ($route && !$this->checkRoute($route, $model, $options['module']))
+      {
+        $name .= '_'.$options['module'];
+      }
+    }
+
-    $routing = sfConfig::get('sf_app_config_dir').'/routing.yml';
-    $content = file_get_contents($routing);
@@ -108 +117 @@
-    if (!isset($routesArray[$name]))
-    {
-
-
-
-
-
-
-
-
-
-
-
+
-      $module = $options['module'] ? $options['module'] : $name;
-      $content = sprintf(<<<EOF
@@ -187 +186 @@
-    return false;
-  }
+
+  /**
+   * Checks whether a route references a model and module.
+   *
+   * @param mixed  $route  A route collection
+   * @param string $model  A model name
+   * @param string $module A module name
+   *
+   * @return boolean
+   */
+  protected function checkRoute($route, $model, $module)
+  {
+    if ($route instanceof sfPropelRouteCollection)
+    {
+      $options = $route->getOptions();
+      return $model == $options['model'] && $module == $options['module'];
+    }
+
+    return false;
+  }
+
+  /**
+   * Returns the name of the model's primary key column.
+   *
+   * @param string $model A model name
+   *
+   * @return string A column name
+   */
+  protected function getPrimaryKey($model)
+  {
+    $map = call_user_func(array(constant($model.'::PEER'), 'getTableMap'));
+
+    if (!$pks = $map->getPrimaryKeys())
+    {
+      return 'id';
+    }
+
+    $column = array_shift($pks);
+
+    return $column->getName();
+  }
-}

branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php

@@ -102 +102 @@
-    $name = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $model));
-
+    if (isset($options['module']))
+    {
+      $route = $this->getRouteFromName($name);
+      if ($route && !$this->checkRoute($route, $model, $options['module']))
+      {
+        $name .= '_'.$options['module'];
+      }
+    }
+
-    $routing = sfConfig::get('sf_app_config_dir').'/routing.yml';
-    $content = file_get_contents($routing);
@@ -178 +187 @@
-    return false;
-  }
+
+  /**
+   * Checks whether a route references a model and module.
+   *
+   * @param mixed  $route  A route collection
+   * @param string $model  A model name
+   * @param string $module A module name
+   *
+   * @return boolean
+   */
+  protected function checkRoute($route, $model, $module)
+  {
+    if ($route instanceof sfDoctrineRouteCollection)
+    {
+      $options = $route->getOptions();
+      return $model == $options['model'] && $module == $options['module'];
+    }
+
+    return false;
+  }
-}

branches/1.4/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateAdminTask.class.php

@@ -102 +102 @@
-    $name = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $model));
-
+    if (isset($options['module']))
+    {
+      $route = $this->getRouteFromName($name);
+      if ($route && !$this->checkRoute($route, $model, $options['module']))
+      {
+        $name .= '_'.$options['module'];
+      }
+    }
+
-    $routing = sfConfig::get('sf_app_config_dir').'/routing.yml';
-    $content = file_get_contents($routing);
@@ -108 +117 @@
-    if (!isset($routesArray[$name]))
-    {
-
-
-
-
-
-
-
-
-
-
-
+
-      $module = $options['module'] ? $options['module'] : $name;
-      $content = sprintf(<<<EOF
@@ -187 +186 @@
-    return false;
-  }
+
+  /**
+   * Checks whether a route references a model and module.
+   *
+   * @param mixed  $route  A route collection
+   * @param string $model  A model name
+   * @param string $module A module name
+   *
+   * @return boolean
+   */
+  protected function checkRoute($route, $model, $module)
+  {
+    if ($route instanceof sfPropelRouteCollection)
+    {
+      $options = $route->getOptions();
+      return $model == $options['model'] && $module == $options['module'];
+    }
+
+    return false;
+  }
+
+  /**
+   * Returns the name of the model's primary key column.
+   *
+   * @param string $model A model name
+   *
+   * @return string A column name
+   */
+  protected function getPrimaryKey($model)
+  {
+    $map = call_user_func(array(constant($model.'::PEER'), 'getTableMap'));
+
+    if (!$pks = $map->getPrimaryKeys())
+    {
+      return 'id';
+    }
+
+    $column = array_shift($pks);
+
+    return $column->getName();
+  }
-}