Added braces check for initDefaultButton (yiisoft#12863)

lirnbo · Oct 27, 2016 · d3c7acc · d3c7acc
1 parent aa6d34a
commit d3c7acc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/framework/grid/ActionColumn.php b/framework/grid/ActionColumn.php
@@ -157,7 +157,7 @@ protected function initDefaultButtons()
      */
     protected function initDefaultButton($name, $iconName, $additionalOptions = [])
     {
-        if (!isset($this->buttons[$name]) && strpos($this->template, $name) !== false) {
+        if (!isset($this->buttons[$name]) && strpos($this->template, '{' . $name . '}') !== false) {
             $this->buttons[$name] = function ($url, $model, $key) use ($name, $iconName, $additionalOptions) {
                 $title = Yii::t('yii', ucfirst($name));
                 $options = array_merge([

diff --git a/tests/framework/grid/ActionColumnTest.php b/tests/framework/grid/ActionColumnTest.php
@@ -24,6 +24,12 @@ public function testInit()
 
         $column = new ActionColumn(['template' => '{show} {edit} {remove}']);
         $this->assertEmpty($column->buttons);
+
+        $column = new ActionColumn(['template' => '{view-items} {update-items} {delete-items}']);
+        $this->assertEmpty($column->buttons);
+
+        $column = new ActionColumn(['template' => '{view} {view-items}']);
+        $this->assertEquals(['view'], array_keys($column->buttons));
     }
 
     public function testRenderDataCell()