From cd6bd007c9db36ea49d3f647f4939129dfa73e04 Mon Sep 17 00:00:00 2001 From: Yarik Date: Wed, 27 Jan 2016 14:32:14 +0200 Subject: [PATCH] test --- common/config/main-local.php | 6 +++--- common/models/OptionHelper.php | 43 +++++++++++++++++++++++++++++++++++++++++-- common/models/User.php | 6 ++++++ frontend/assets/AdminAsset.php | 2 +- frontend/assets/AppAsset.php | 2 +- frontend/views/accounts/cabinet.php | 6 ++++-- frontend/views/layouts/main.php | 2 +- 7 files changed, 57 insertions(+), 10 deletions(-) diff --git a/common/config/main-local.php b/common/config/main-local.php index f47e800..fc2943b 100755 --- a/common/config/main-local.php +++ b/common/config/main-local.php @@ -3,9 +3,9 @@ return [ 'components' => [ 'db' => [ 'class' => 'yii\db\Connection', - 'dsn' => 'pgsql:host=195.248.225.149;port=5432;dbname=mfp', - 'username' => 'test33', - 'password' => 'E4q2N7i9', + 'dsn' => 'pgsql:host=127.0.0.1;port=5432;dbname=mfp_local', + 'username' => 'postgres', + 'password' => '', 'schemaMap' => [ 'pgsql'=> [ 'class'=>'yii\db\pgsql\Schema', diff --git a/common/models/OptionHelper.php b/common/models/OptionHelper.php index 932b2e2..8d7b829 100755 --- a/common/models/OptionHelper.php +++ b/common/models/OptionHelper.php @@ -28,7 +28,7 @@ class OptionHelper extends Model throw new InvalidParamException(Yii::t('app', 'Must be 1-3')); } } - + /* public function createOptions($user_id) { if($rows_delete = \Yii::$app->db->createCommand()->delete('option', ['model' => 'common\models\User', 'model_id' => $user_id])->execute()) { @@ -36,7 +36,46 @@ class OptionHelper extends Model } else { Yii::trace( "No rows has been deleted" ); } - //Yii::$app->db->createCommand()->batchInsert('option', ['model', 'model_id', 'name', 'template', 'option_pid'], [['common\models\User', $user_id, 'about', '']]) + $rows_insert = Yii::$app->db->createCommand()->batchInsert( + 'option', + ['model', 'model_id', 'name', 'template'], + [ + ['common\models\User', $user_id, 'education', '{"template":"empty","params":{"multiple":true}}'], + ['common\models\User', $user_id, 'development', '{"template":"empty","params":{"multiple":true}}'], + ['common\models\User', $user_id, 'courses', '{"template":"empty","params":{"multiple":true}}'], + ['common\models\User', $user_id, 'jobs', '{"template":"empty","params":{"multiple":true}}'], + ['common\models\User', $user_id, 'social', '{"template":"empty","params":{"multiple":true}}'], + ] + )->execute(); + Yii::trace( $rows_insert . " rows has been inserted" ); + $parent_rows = Option::find()->where(['model' => 'common\models\User', 'model_id' => $user_id, 'option_pid' => NULL])->indexBy('name')->all(); + $rows_insert = Yii::$app->db->createCommand()->batchInsert( + 'option', + ['model', 'model_id', 'name', 'template', 'option_pid'], + [ + ['common\models\User', $user_id, 'year_from', '{"template":"input","params":{"type":"number"}}', $parent_rows['education']->option_id], + ['common\models\User', $user_id, 'year_to', '{"template":"input","params":{"type":"number"}}', $parent_rows['education']->option_id], + ['common\models\User', $user_id, 'place', '{"template":"textInput","params":[]}', $parent_rows['education']->option_id], + ['common\models\User', $user_id, 'year', '{"template":"input","params":{"type":"number"}}', $parent_rows['development']->option_id], + ['common\models\User', $user_id, 'name', '{"template":"textInput","params":[]}', $parent_rows['development']->option_id], + ['common\models\User', $user_id, 'year', '{"template":"input","params":{"type":"number"}}', $parent_rows['courses']->option_id], + ['common\models\User', $user_id, 'name', '{"template":"textInput","params":[]}', $parent_rows['courses']->option_id], + ['common\models\User', $user_id, 'country', '{"template":"textInput","params":[]}', $parent_rows['jobs']->option_id], + ['common\models\User', $user_id, 'date_from', '{"template":"datePicker","params":{"dateFormat":"dd-MM-yyyy"}}', $parent_rows['jobs']->option_id], + ['common\models\User', $user_id, 'date_to', '{"template":"datePicker","params":{"dateFormat":"dd-MM-yyyy"}}', $parent_rows['jobs']->option_id], + ['common\models\User', $user_id, 'type', '{"template":"textInput","params":[]}', $parent_rows['jobs']->option_id], + ['common\models\User', $user_id, 'team', '{"template":"input","params":{"type":"number"}}', $parent_rows['jobs']->option_id], + ['common\models\User', $user_id, 'time', '{"template":"input","params":{"type":"number"}}', $parent_rows['jobs']->option_id], + ['common\models\User', $user_id, 'percent', '{"template":"input","params":{"type":"number"}}', $parent_rows['jobs']->option_id], + ['common\models\User', $user_id, 'position', '{"template":"textInput","params":[]}', $parent_rows['jobs']->option_id], + ['common\models\User', $user_id, 'facebook', '{"template":"textInput","params":[]}', $parent_rows['social']->option_id], + ['common\models\User', $user_id, 'twitter', '{"template":"textInput","params":[]}', $parent_rows['social']->option_id], + ['common\models\User', $user_id, 'linkedin', '{"template":"textInput","params":[]}', $parent_rows['social']->option_id], + ['common\models\User', $user_id, 'vk', '{"template":"textInput","params":[]}', $parent_rows['social']->option_id], + ] + )->execute(); } + */ + } diff --git a/common/models/User.php b/common/models/User.php index e555475..3f28841 100755 --- a/common/models/User.php +++ b/common/models/User.php @@ -253,4 +253,10 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface return $result; } } + + public function afterSave ($insert, $changedAttributes) + { + parent::afterSave ($insert, $changedAttributes); + \Yii::$app->options->createOptions($this->id); + } } diff --git a/frontend/assets/AdminAsset.php b/frontend/assets/AdminAsset.php index 968f11a..b3cd25d 100755 --- a/frontend/assets/AdminAsset.php +++ b/frontend/assets/AdminAsset.php @@ -23,7 +23,7 @@ class AdminAsset extends AssetBundle ]; public $js = [ 'js/script.js', - 'http://maps.google.com/maps/api/js?sensor=false', + //'http://maps.google.com/maps/api/js?sensor=false', 'js/markerclusterer.js', 'js/jquery.scrollbox.min.js', 'js/slider.js', diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 342c543..887c4a7 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -23,7 +23,7 @@ class AppAsset extends AssetBundle ]; public $js = [ 'js/script.js', - 'http://maps.google.com/maps/api/js?sensor=false', + //'http://maps.google.com/maps/api/js?sensor=false', 'js/markerclusterer.js', 'js/jquery.scrollbox.min.js', 'js/slider.js', diff --git a/frontend/views/accounts/cabinet.php b/frontend/views/accounts/cabinet.php index 210891e..e2ac4d5 100755 --- a/frontend/views/accounts/cabinet.php +++ b/frontend/views/accounts/cabinet.php @@ -1,7 +1,9 @@ title = 'Мой профиль'; + $this->title = 'Мой профиль'; $this->params['breadcrumbs'][] = $this->title; ?> -

title ?>

\ No newline at end of file +

title ?>

+ diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index d9fa802..8917a08 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -17,7 +17,7 @@ AppAsset::register($this); - + -- libgit2 0.21.4