Merge branch 'feature/max-columns' into feature/wedding-2023-04

schmunk42 · Apr 12, 2023 · 8ff455c · 8ff455c
2 parents 212709b + e6db624
commit 8ff455c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/commands/BatchController.php b/src/commands/BatchController.php
@@ -270,6 +270,11 @@ class BatchController extends Controller
      */
     public $crudFixOutput = false;
 
+    /**
+     * @var integer number of grid columns in crud generator
+     */
+    public $crudGridMaxColumns = 8;
+
     /**
      * @var string the namespace of the ActiveQuery class to be generated
      */
@@ -528,6 +533,7 @@ public function actionCruds()
                 'indexWidgetType' => $this->crudIndexWidgetType,
                 'indexGridClass' => $this->crudIndexGridClass,
                 'formLayout' => $this->crudFormLayout,
+                'gridMaxColumns' => $this->crudGridMaxColumns,
                 'generateAccessFilterMigrations' => $this->generateAccessFilterMigrations,
                 'actionButtonColumnPosition' => $this->crudActionButtonColumnPosition,
             ];

diff --git a/src/generators/model/Generator.php b/src/generators/model/Generator.php
@@ -384,7 +384,7 @@ public function generateClassName($tableName, $useSchemaName = null)
         $patterns[] = "/^{$db->tablePrefix}(.*?)$/";
         $patterns[] = "/^(.*?){$db->tablePrefix}$/";
 
-        if (strpos($this->tableName, '*') !== false) {
+        if (strpos((string)$this->tableName, '*') !== false) {
             $pattern = $this->tableName;
             if (($pos = strrpos($pattern, '.')) !== false) {
                 $pattern = substr($pattern, $pos + 1);