Changeset 9477

Timestamp:

06/09/08 11:41:14 (2 years ago)

Author:

fabien

Message:

refactored renderPartial() and renderComponent() in sfAction (code has been splitted to create a getPartial() and a getComponent() method)

Files:

• branches/1.1/lib/action/sfAction.class.php (modified) (4 diffs)

branches/1.1/lib/action/sfAction.class.php

@@ -257 +257 @@
-
-  /**
-
-
+
-   *
-   * If the vars parameter is omitted, the action's internal variables
@@ -266 +265 @@
-   * available in the partial.
-   *
-   * This method must be called as with a return:
-   *
-   * <code>return $this->renderPartial('foo/bar')</code>
-   *
-   * @param  string $templateName partial name
-   * @param  array  $vars         vars
-   *
+   * @return string The partial content
+   */
+  public function getPartial($templateName, $vars = null)
+  {
+    sfLoader::loadHelpers('Partial');
+
+    $vars = !is_null($vars) ? $vars : $this->varHolder->getAll();
+
+    return get_partial($templateName, $vars);
+  }
+
+  /**
+   * Appends the result of the given partial execution to the response content.
+   *
+   * This method must be called as with a return:
+   *
+   * <code>return $this->renderPartial('foo/bar')</code>
+   *
+   * @param  string $templateName partial name
+   * @param  array  $vars         vars
+   *
-   * @return sfView::NONE
+   *
+   * @see    getPartial
-   */
-  public function renderPartial($templateName, $vars = null)
-  {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-   *
-   * If the vars parameter is omitted, the action's internal variables
@@ -293 +306 @@
-   * If the vars parameter is set then only those values are
-   * available in the component.
-   *
-   * This method must be called as with a return:
-   *
-   * <code>return $this->renderComponent('foo', 'bar')</code>
-   *
-   * @param  string  $moduleName    module name
@@ -302 +311 @@
-   * @param  array   $vars          vars
-   *
+   * @return string  The component rendered content
+   */
+  public function getComponent($moduleName, $componentName, $vars = null)
+  {
+    sfLoader::loadHelpers('Partial');
+
+    $vars = !is_null($vars) ? $vars : $this->varHolder->getAll();
+
+    return get_component($moduleName, $componentName, $vars);
+  }
+
+  /**
+   * Appends the result of the given component execution to the response content.
+   *
+   * This method must be called as with a return:
+   *
+   * <code>return $this->renderComponent('foo', 'bar')</code>
+   *
+   * @param  string  $moduleName    module name
+   * @param  string  $componentNae  component name
+   * @param  array   $vars          vars
+   *
-   * @return sfView::NONE
+   *
+   * @see    getComponent
-   */
-  public function renderComponent($moduleName, $componentName, $vars = null)
-  {
-
-
-
-
-
+
-  }
-