diff --git a/common/models/CompanyInfo.php b/common/models/CompanyInfo.php index efca4da..45617c7 100755 --- a/common/models/CompanyInfo.php +++ b/common/models/CompanyInfo.php @@ -52,6 +52,7 @@ [ 'staff' ], 'integer', 'min' => 1, + 'max' => 100000 ], ]; } diff --git a/common/models/User.php b/common/models/User.php index 052010f..e0f17cf 100755 --- a/common/models/User.php +++ b/common/models/User.php @@ -437,7 +437,7 @@ public function getAddress() { $address = $this->userInfo->city; - if(!empty($this->userInfo->county)) { + if(!empty($this->userInfo->country)) { $address = $this->userInfo->country.', '.$address; } if($this->type == 2) { diff --git a/frontend/views/layouts/admin.php b/frontend/views/layouts/admin.php index ab93ce9..fa892de 100755 --- a/frontend/views/layouts/admin.php +++ b/frontend/views/layouts/admin.php @@ -38,11 +38,6 @@ ], [ - 'label' => 'Вакансии', - 'url' => [ 'accounts/vacancy' ], - 'active' => preg_match('/^vacancy.*$/', $this->context->action->id) ? true : false, - ], - [ 'label' => Yii::t('app', 'Your projects'), 'url' => [ 'accounts/projects' ], 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false, @@ -83,7 +78,7 @@ ], [ 'label' => 'Закладки', - 'url' => [ 'accounts/bookmarks' ], + 'url' => [ '/bookmarks' ], 'options' => [ 'class' => 'admin-menu-icons admin-menu-ico-3', ], ], [ @@ -108,10 +103,14 @@ ); } else if(\Yii::$app->user->identity->type == 2) { array_push($item, [ - 'label' => 'Команда', - 'url' => [ 'accounts/team' ], - 'active' => preg_match('/^team.*$/', $this->context->action->id) ? true : false, - ]); + 'label' => 'Команда', + 'url' => [ 'accounts/team' ], + 'active' => preg_match('/^team.*$/', $this->context->action->id) ? true : false, + ], [ + 'label' => 'Вакансии', + 'url' => [ 'accounts/vacancy' ], + 'active' => preg_match('/^vacancy.*$/', $this->context->action->id) ? true : false, + ]); } diff --git a/frontend/views/search/performer.php b/frontend/views/search/performer.php index f40e9ae..cc993d0 100755 --- a/frontend/views/search/performer.php +++ b/frontend/views/search/performer.php @@ -1,6 +1,6 @@ 'get', ]); ?> - - = $form->field($model, 'city') ->widget(Select2::classname(), [ 'options' => [ 'placeholder' => 'Выбор города ...' ], @@ -177,8 +175,11 @@ $form2->end(); ?> - - = Html::a('Добавить себя в каталог', Url::toRoute('accounts/service'), [ 'class' => 'add-to-catalog-search-worker' ]) ?> + user->id) || empty(\Yii::$app->user->identity->specializations)) { + echo Html::a('Добавить себя в каталог', Url::toRoute('accounts/service'), [ 'class' => 'add-to-catalog-search-worker' ]); + } + ?>