fix: i18n and widget for yii2 2.0.22

krissss · Jul 15, 2019 · 187da28 · 187da28
1 parent d058194
commit 187da28
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/widgets/SimpleActiveForm.php b/widgets/SimpleActiveForm.php
@@ -57,15 +57,24 @@ public function init()
     public function run()
     {
         $header = $this->renderHeader();
-        $content = parent::run();
+        $content = ob_get_clean();
         $footer = $this->renderFooter();
+
+        $beginForm = Html::beginForm($this->action, $this->method, $this->options);
+        if ($this->enableClientScript) {
+            $this->registerClientScript();
+        }
+        $endFrom = Html::endForm();
+
         $html = <<<HTML
 <div class="box box-default">
+    {$beginForm}
     {$header}
     <div class="box-body">
         {$content}
     </div>
     {$footer}
+    {$endFrom}
 </div>
 HTML;
         return $html;

diff --git a/widgets/SimpleAjaxForm.php b/widgets/SimpleAjaxForm.php
@@ -2,10 +2,10 @@
 
 namespace kriss\widgets;
 
+use kartik\widgets\ActiveForm;
 use Yii;
 use yii\base\Widget;
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
 
 class SimpleAjaxForm extends ActiveForm
 {
@@ -55,18 +55,26 @@ public function run()
     {
         $modalSize = $this->modalSize ? ('modal-' . $this->modalSize) : '';
         $modalHeader = $this->renderHeader();
-        $modalBody = parent::run();
+        $modalBody = ob_get_clean();
         $modalFooter = $this->renderFooter();
 
+        $beginForm = Html::beginForm($this->action, $this->method, $this->options);
+        if ($this->enableClientScript) {
+            $this->registerClientScript();
+        }
+        $endFrom = Html::endForm();
+
         $html = <<<HTML
 <div class="modal fade ajax_modal">
   <div class="modal-dialog {$modalSize}">
     <div class="modal-content">
+      {$beginForm}
       {$modalHeader}
       <div class="modal-body">
         {$modalBody}
       </div>
       {$modalFooter}
+      {$endFrom}
     </div>
   </div>
 </div>