Исправление обработки вложенных виджетов при ajax загрузке

petrgrishin · Aug 3, 2014 · 93f3e2c · 93f3e2c
1 parent 3f997eb
commit 93f3e2c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/ViewRenderer.php b/src/ViewRenderer.php
@@ -23,12 +23,10 @@ public static function className() {
     public function renderFile($context, $sourceFile, $params, $isReturn) {
         $viewId = $this->generateViewId($sourceFile);
         $view = new View($viewId, $context);
-        if ($context instanceof Widget) {
-            $context->setView($view);
-        }
+        $isContextWidget = $this->isContextWidget($context) && $context->setView($view);
         $view->setParams($params);
         $view->setScriptFile($this->getScriptFile($sourceFile));
-        if ($this->isAjaxRequest()) {
+        if (!$isContextWidget && $this->isAjaxRequest()) {
             $response = $this->renderAjax($view, $sourceFile);
             $this->getScriptProcessor()->processView($view, true);
         } else {
@@ -87,6 +85,10 @@ protected function isAjaxRequest() {
         return $this->getRequest()->getIsAjaxRequest();
     }
 
+    protected function isContextWidget($context) {
+        return $context instanceof Widget;
+    }
+
     /**
      * @param $sourceFile
      * @return string