Fixed bugs

execut · Mar 1, 2018 · 36dfb6a · 36dfb6a
1 parent aa460f4
commit 36dfb6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/widgets/GridView.php b/widgets/GridView.php
@@ -63,7 +63,7 @@ protected function registerWidget($name = null, $id = null)
 
         $this->_registerBundle();
 
-        if (!$this->isAjaxCrud) {
+        if (!$this->isAjaxCrud && $this->getUpdateUrl()) {
             if ($id === null) {
                 $id = $this->options['id'];
             }
@@ -128,7 +128,7 @@ public function getToolbarConfig(): array
             }
         }
 
-        return ArrayHelper::merge($this->toolbar, [
+        return ArrayHelper::merge([
 //            'massEdit' => ['content' => $this->renderMassEditButton()],
 //            'massVisible' => ['content' => $this->renderVisibleButtons()],
             'add' => ['content' => $this->renderAddButton()],
@@ -139,7 +139,7 @@ public function getToolbarConfig(): array
 //            'dynaParams' => ['content' => '{dynagridFilter}{dynagridSort}{dynagrid}'],
 //            'toggleData' => '{toggleData}',
 //            'export' => '{export}',
-        ]);
+        ], $this->toolbar);
     }
 
     public function beginPjax() {

diff --git a/widgets/assets/EditDialog.js b/widgets/assets/EditDialog.js
@@ -53,7 +53,7 @@
                         attributes;
                     if (typeof t.options.attributesElement === 'undefined') {
                         targetEl = $(e.target);
-                        if (targetEl.parents('a').length || targetEl.is('a')) {
+                        if (targetEl.parents('a').length || targetEl.is('a') || targetEl.is(':button')) {
                             return true;
                         }