Browse Source

Removed extra \models\forms namespace, moved all models to just \models

tags/2.0.0-beta
Alexander Makarov 11 years ago
parent
commit
a1497ca01c
  1. 2
      apps/advanced/backend/controllers/SiteController.php
  2. 2
      apps/advanced/backend/views/site/login.php
  3. 2
      apps/advanced/common/models/LoginForm.php
  4. 10
      apps/advanced/frontend/controllers/SiteController.php
  5. 2
      apps/advanced/frontend/models/ContactForm.php
  6. 2
      apps/advanced/frontend/models/PasswordResetRequestForm.php
  7. 2
      apps/advanced/frontend/models/ResetPasswordForm.php
  8. 2
      apps/advanced/frontend/models/SignupForm.php
  9. 2
      apps/advanced/frontend/views/site/contact.php
  10. 2
      apps/advanced/frontend/views/site/login.php
  11. 2
      apps/advanced/frontend/views/site/requestPasswordResetToken.php
  12. 2
      apps/advanced/frontend/views/site/resetPassword.php
  13. 2
      apps/advanced/frontend/views/site/signup.php

2
apps/advanced/backend/controllers/SiteController.php

@ -4,7 +4,7 @@ namespace backend\controllers;
use Yii;
use yii\web\AccessControl;
use yii\web\Controller;
use common\models\forms\LoginForm;
use common\models\LoginForm;
/**
* Site controller

2
apps/advanced/backend/views/site/login.php

@ -5,7 +5,7 @@ use yii\widgets\ActiveForm;
/**
* @var yii\web\View $this
* @var yii\widgets\ActiveForm $form
* @var common\models\forms\LoginForm $model
* @var \common\models\LoginForm $model
*/
$this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title;

2
apps/advanced/common/models/forms/LoginForm.php → apps/advanced/common/models/LoginForm.php

@ -1,5 +1,5 @@
<?php
namespace common\models\forms;
namespace common\models;
use common\models\User;
use yii\base\Model;

10
apps/advanced/frontend/controllers/SiteController.php

@ -1,11 +1,11 @@
<?php
namespace frontend\controllers;
use common\models\forms\LoginForm;
use frontend\models\forms\PasswordResetRequestForm;
use frontend\models\forms\ResetPasswordForm;
use frontend\models\forms\SignupForm;
use frontend\models\forms\ContactForm;
use common\models\LoginForm;
use frontend\models\PasswordResetRequestForm;
use frontend\models\ResetPasswordForm;
use frontend\models\SignupForm;
use frontend\models\ContactForm;
use yii\base\InvalidParamException;
use yii\web\BadRequestHttpException;
use yii\web\Controller;

2
apps/advanced/frontend/models/forms/ContactForm.php → apps/advanced/frontend/models/ContactForm.php

@ -1,6 +1,6 @@
<?php
namespace frontend\models\forms;
namespace frontend\models;
use Yii;
use yii\base\Model;

2
apps/advanced/frontend/models/forms/PasswordResetRequestForm.php → apps/advanced/frontend/models/PasswordResetRequestForm.php

@ -1,5 +1,5 @@
<?php
namespace frontend\models\forms;
namespace frontend\models;
use common\models\User;
use yii\base\Model;

2
apps/advanced/frontend/models/forms/ResetPasswordForm.php → apps/advanced/frontend/models/ResetPasswordForm.php

@ -1,5 +1,5 @@
<?php
namespace frontend\models\forms;
namespace frontend\models;
use common\models\User;
use yii\base\InvalidParamException;

2
apps/advanced/frontend/models/forms/SignupForm.php → apps/advanced/frontend/models/SignupForm.php

@ -1,5 +1,5 @@
<?php
namespace frontend\models\forms;
namespace frontend\models;
use common\models\User;
use yii\base\Model;

2
apps/advanced/frontend/views/site/contact.php

@ -6,7 +6,7 @@ use yii\captcha\Captcha;
/**
* @var yii\web\View $this
* @var yii\widgets\ActiveForm $form
* @var \frontend\models\forms\ContactForm $model
* @var \frontend\models\ContactForm $model
*/
$this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title;

2
apps/advanced/frontend/views/site/login.php

@ -5,7 +5,7 @@ use yii\widgets\ActiveForm;
/**
* @var yii\web\View $this
* @var yii\widgets\ActiveForm $form
* @var common\models\forms\LoginForm $model
* @var \common\models\LoginForm $model
*/
$this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title;

2
apps/advanced/frontend/views/site/requestPasswordResetToken.php

@ -5,7 +5,7 @@ use yii\widgets\ActiveForm;
/**
* @var yii\web\View $this
* @var yii\widgets\ActiveForm $form
* @var \frontend\models\forms\PasswordResetRequestForm $model
* @var \frontend\models\PasswordResetRequestForm $model
*/
$this->title = 'Request password reset';
$this->params['breadcrumbs'][] = $this->title;

2
apps/advanced/frontend/views/site/resetPassword.php

@ -5,7 +5,7 @@ use yii\widgets\ActiveForm;
/**
* @var yii\web\View $this
* @var yii\widgets\ActiveForm $form
* @var \frontend\models\forms\ResetPasswordForm $model
* @var \frontend\models\ResetPasswordForm $model
*/
$this->title = 'Reset password';
$this->params['breadcrumbs'][] = $this->title;

2
apps/advanced/frontend/views/site/signup.php

@ -5,7 +5,7 @@ use yii\widgets\ActiveForm;
/**
* @var yii\web\View $this
* @var yii\widgets\ActiveForm $form
* @var \frontend\models\forms\SignupForm $model
* @var \frontend\models\SignupForm $model
*/
$this->title = 'Signup';
$this->params['breadcrumbs'][] = $this->title;

Loading…
Cancel
Save