Finish version/v.0.0.62

This commit is contained in:
Roland Schneider 2016-04-08 23:06:05 +02:00
commit 858db39d98
9 changed files with 21 additions and 4 deletions

View File

@ -33,6 +33,8 @@ class UserCreate extends User{
[['role'], 'required'], [['role'], 'required'],
[['role'], 'string', 'max' => 20], [['role'], 'string', 'max' => 20],
['status', 'default', 'value' => self::STATUS_ACTIVE],
['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]],
]; ];
} }
@ -47,7 +49,7 @@ class UserCreate extends User{
public function attributeLabels(){ public function attributeLabels(){
return [ return [
'status' => 'Státusz',
'email' =>'E-mail', 'email' =>'E-mail',
'username' =>'Felhasználónév', 'username' =>'Felhasználónév',
'created_at' =>'Létrehozás dátuma', 'created_at' =>'Létrehozás dátuma',

View File

@ -47,7 +47,7 @@ class UserSearch extends User
'query' => $query, 'query' => $query,
]); ]);
$query->andWhere(['status' => User::STATUS_ACTIVE]); //$query->andWhere(['status' => User::STATUS_ACTIVE]);
$this->load($params); $this->load($params);

View File

@ -33,6 +33,10 @@ class UserUpdate extends User {
], ],
[['role'], 'required'], [['role'], 'required'],
[['role'], 'string', 'max' => 20], [['role'], 'string', 'max' => 20],
['status', 'default', 'value' => self::STATUS_ACTIVE],
['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]],
]; ];
} }
@ -51,6 +55,7 @@ class UserUpdate extends User {
public function attributeLabels() { public function attributeLabels() {
return [ return [
'status' => 'Státusz',
'email' => 'E-mail', 'email' => 'E-mail',
'username' => 'Felhasználónév', 'username' => 'Felhasználónév',
'created_at' => 'Létrehozás dátuma', 'created_at' => 'Létrehozás dátuma',

View File

@ -5,6 +5,7 @@ use yii\widgets\ActiveForm;
use yii\grid\GridView; use yii\grid\GridView;
use yii\data\ArrayDataProvider; use yii\data\ArrayDataProvider;
use common\components\RoleDefinition; use common\components\RoleDefinition;
use common\models\User;
/* @var $this yii\web\View */ /* @var $this yii\web\View */
/* @var $model common\models\User */ /* @var $model common\models\User */
@ -25,6 +26,8 @@ asort($roleOptions);
<?= $form->field($model, 'username')->textInput() ?> <?= $form->field($model, 'username')->textInput() ?>
<?= $form->field($model, 'email')->textInput() ?> <?= $form->field($model, 'email')->textInput() ?>
<?= $form->field($model, 'status')
->dropDownList(User::statuses())->hint("Csak aktív felhasználó tud bejelentkezni") ?>
<?= $form->field($model, 'password_plain')->passwordInput() ?> <?= $form->field($model, 'password_plain')->passwordInput() ?>
<?= $form->field($model, 'password_repeat')->passwordInput() ?> <?= $form->field($model, 'password_repeat')->passwordInput() ?>
<?= $form->field($model, 'role')->dropDownList($roleOptions) ?> <?= $form->field($model, 'role')->dropDownList($roleOptions) ?>

View File

@ -31,7 +31,7 @@ $this->params['breadcrumbs'][] = $this->title;
'username', 'username',
'email:email', 'email:email',
'created_at:datetime', 'created_at:datetime',
['attribute' => 'status' , 'value' => 'statusHuman'],
[ [
'attribute' => 'role', 'attribute' => 'role',
'value' => function ($model){ 'value' => function ($model){

2
botond_daily.sh Normal file
View File

@ -0,0 +1,2 @@
php /var/www/virtual/fitnessadmin.hu/htdocs/fitness-web/yii ticket/index

View File

@ -1,3 +1,7 @@
-0.0.62
- add botond daily
-0.0.61
- add user status edit
-0.0.60 -0.0.60
- allow ticket installment request, when status is sent - allow ticket installment request, when status is sent
-0.0.59 -0.0.59

View File

@ -4,7 +4,7 @@ return [
'supportEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu', 'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.0.60', 'version' => 'v0.0.62',
'company' => 'movar',//gyor 'company' => 'movar',//gyor
'company_name' => "Freimann Kft.", 'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global 'product_visiblity' => 'account',// on reception which products to display. account or global

View File

@ -212,6 +212,7 @@ class User extends ActiveRecord implements IdentityInterface
public function attributeLabels(){ public function attributeLabels(){
return [ return [
'status' => 'Státusz',
'username' => Yii::t('backend/user', 'Username'), 'username' => Yii::t('backend/user', 'Username'),
'email' => Yii::t('backend/user', 'E-Mail'), 'email' => Yii::t('backend/user', 'E-Mail'),
'created_at' => Yii::t('backend/user', 'Created at'), 'created_at' => Yii::t('backend/user', 'Created at'),