|
@@ -255,7 +255,7 @@ class Crud extends Command |
|
@@ -255,7 +255,7 @@ class Crud extends Command |
255
|
$controller = str_replace('_', '', $controller);
|
255
|
$controller = str_replace('_', '', $controller);
|
256
|
$controllerArr = !$controller ? explode('_', strtolower($table)) : explode('/', strtolower($controller));
|
256
|
$controllerArr = !$controller ? explode('_', strtolower($table)) : explode('/', strtolower($controller));
|
257
|
$controllerUrl = implode('/', $controllerArr);
|
257
|
$controllerUrl = implode('/', $controllerArr);
|
258
|
- $controllerName = mb_ucfirst(array_pop($controllerArr));
|
258
|
+ $controllerName = ucfirst(array_pop($controllerArr));
|
259
|
$controllerDir = implode(DS, $controllerArr);
|
259
|
$controllerDir = implode(DS, $controllerArr);
|
260
|
$controllerFile = ($controllerDir ? $controllerDir . DS : '') . $controllerName . '.php';
|
260
|
$controllerFile = ($controllerDir ? $controllerDir . DS : '') . $controllerName . '.php';
|
261
|
$viewDir = $adminPath . 'view' . DS . $controllerUrl . DS;
|
261
|
$viewDir = $adminPath . 'view' . DS . $controllerUrl . DS;
|
|
@@ -810,7 +810,7 @@ class Crud extends Command |
|
@@ -810,7 +810,7 @@ class Crud extends Command |
810
|
if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio']))
|
810
|
if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio']))
|
811
|
return;
|
811
|
return;
|
812
|
$fieldList = $this->getFieldListName($field);
|
812
|
$fieldList = $this->getFieldListName($field);
|
813
|
- $methodName = 'get' . mb_ucfirst($fieldList);
|
813
|
+ $methodName = 'get' . ucfirst($fieldList);
|
814
|
foreach ($itemArr as $k => &$v)
|
814
|
foreach ($itemArr as $k => &$v)
|
815
|
{
|
815
|
{
|
816
|
$v = "__('" . mb_ucfirst($v) . "')";
|
816
|
$v = "__('" . mb_ucfirst($v) . "')";
|
|
@@ -832,7 +832,7 @@ EOD; |
|
@@ -832,7 +832,7 @@ EOD; |
832
|
{
|
832
|
{
|
833
|
if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio']))
|
833
|
if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio']))
|
834
|
return;
|
834
|
return;
|
835
|
- $attrField = mb_ucfirst($this->getCamelizeName($field));
|
835
|
+ $attrField = ucfirst($this->getCamelizeName($field));
|
836
|
$getAttr[] = $this->getReplacedStub("mixins" . DS . $inputType, ['field' => $field, 'methodName' => "get{$attrField}TextAttr", 'listMethodName' => "get{$attrField}List"]);
|
836
|
$getAttr[] = $this->getReplacedStub("mixins" . DS . $inputType, ['field' => $field, 'methodName' => "get{$attrField}TextAttr", 'listMethodName' => "get{$attrField}List"]);
|
837
|
}
|
837
|
}
|
838
|
|
838
|
|
|
@@ -840,7 +840,7 @@ EOD; |
|
@@ -840,7 +840,7 @@ EOD; |
840
|
{
|
840
|
{
|
841
|
if ($inputType != 'datetime')
|
841
|
if ($inputType != 'datetime')
|
842
|
return;
|
842
|
return;
|
843
|
- $attrField = mb_ucfirst($this->getCamelizeName($field));
|
843
|
+ $attrField = ucfirst($this->getCamelizeName($field));
|
844
|
if ($inputType == 'datetime')
|
844
|
if ($inputType == 'datetime')
|
845
|
{
|
845
|
{
|
846
|
$return = <<<EOD
|
846
|
$return = <<<EOD
|
|
@@ -868,13 +868,13 @@ EOD; |
|
@@ -868,13 +868,13 @@ EOD; |
868
|
{
|
868
|
{
|
869
|
$modelarr = explode('_', strtolower($table));
|
869
|
$modelarr = explode('_', strtolower($table));
|
870
|
foreach ($modelarr as $k => &$v)
|
870
|
foreach ($modelarr as $k => &$v)
|
871
|
- $v = mb_ucfirst($v);
|
871
|
+ $v = ucfirst($v);
|
872
|
unset($v);
|
872
|
unset($v);
|
873
|
$modelName = implode('', $modelarr);
|
873
|
$modelName = implode('', $modelarr);
|
874
|
}
|
874
|
}
|
875
|
else
|
875
|
else
|
876
|
{
|
876
|
{
|
877
|
- $modelName = mb_ucfirst($model);
|
877
|
+ $modelName = ucfirst($model);
|
878
|
}
|
878
|
}
|
879
|
return $modelName;
|
879
|
return $modelName;
|
880
|
}
|
880
|
}
|