diff --git a/src/Umi/DataTable/DataType/BcryptPasswordDataType.php b/src/Umi/DataTable/DataType/BcryptPasswordDataType.php index 2374c47..0a00d41 100644 --- a/src/Umi/DataTable/DataType/BcryptPasswordDataType.php +++ b/src/Umi/DataTable/DataType/BcryptPasswordDataType.php @@ -6,16 +6,17 @@ class BcryptPasswordDataType extends DataTypeAbstract { public function regulateDataEditAdd($data, $relatedTable = '', $relatedField = '', $validation = '', $option = []) { - return $this->getHtml($data, $option); + return $this->getHtml($data, $option, $validation); } - private function getHtml($data, $option) + private function getHtml($data, $option, $validation) { $property = $this->getProperty($option); + $validation = $this->getValidation($validation); $url = url('/api/generatePassword'); return << + - diff --git a/src/resources/views/common/authority/permissionCheckBox.blade.php b/src/resources/views/common/authority/permissionCheckBox.blade.php index 18c1ea9..0ce5ee2 100644 --- a/src/resources/views/common/authority/permissionCheckBox.blade.php +++ b/src/resources/views/common/authority/permissionCheckBox.blade.php @@ -33,7 +33,7 @@ @@ -42,7 +42,7 @@ @@ -51,7 +51,7 @@ @@ -60,7 +60,7 @@ @@ -69,7 +69,7 @@ diff --git a/src/resources/views/login.blade.php b/src/resources/views/login.blade.php index 9e35d47..c81d991 100644 --- a/src/resources/views/login.blade.php +++ b/src/resources/views/login.blade.php @@ -5,7 +5,7 @@ UMI admin - login page - +