diff --git a/backend/web/js/fieldWidget.js b/backend/web/js/fieldWidget.js index a409e2d..e69de29 100755 --- a/backend/web/js/fieldWidget.js +++ b/backend/web/js/fieldWidget.js @@ -1,9 +0,0 @@ -$(document).ready(function(){ - $('body').on('click', '.delete-field-item', function(){ - - $(this).parent('.form-group').remove(); - - }); - - -}); \ No newline at end of file diff --git a/common/models/UserInfo.php b/common/models/UserInfo.php index e28548e..071f082 100755 --- a/common/models/UserInfo.php +++ b/common/models/UserInfo.php @@ -88,10 +88,6 @@ 'country', 'image', 'poster', - 'social_vk', - 'social_fb', - 'social_in', - 'social_t', ], 'string', ], @@ -158,6 +154,34 @@ 'integer', 'min' => 0, ], + [ + [ + 'social_vk', + ], + 'match', + 'pattern' => '/^(?:https?:\/\/)?(?:www\.)?vk\.com\/[\S]+\/?$/', + ], + [ + [ + 'social_fb', + ], + 'match', + 'pattern' => '/^(?:https?:\/\/)?(?:www\.)?facebook\.com\/[\S]+\/?$/', + ], + [ + [ + 'social_in', + ], + 'match', + 'pattern' => '/^(?:https?:\/\/)?(?:www\.)?linkedin\.com\/(?:pub|in)\/[\S]+\/?$/', + ], + [ + [ + 'social_t', + ], + 'match', + 'pattern' => '/^(?:https?:\/\/)?(?:www\.)?twitter\.com\/[\S]+\/?$/', + ], ]; } diff --git a/common/widgets/views/site_field.php b/common/widgets/views/site_field.php index 14043c7..078ac17 100644 --- a/common/widgets/views/site_field.php +++ b/common/widgets/views/site_field.php @@ -19,7 +19,7 @@ use yii\helpers\Html; 'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
- +
@@ -41,7 +41,7 @@ use yii\helpers\Html; '
'+ ''+ - ''+ + ''+ '
'+ ''+ '
'; diff --git a/frontend/controllers/AccountsController.php b/frontend/controllers/AccountsController.php index 464e482..8a20518 100755 --- a/frontend/controllers/AccountsController.php +++ b/frontend/controllers/AccountsController.php @@ -183,7 +183,9 @@ $user_info = new UserInfo([ 'user_id' => \Yii::$app->user->getId() ]); } if(!empty( \Yii::$app->request->post() )) { - Fields::saveFieldData(Yii::$app->request->post('Fields'), \Yii::$app->user->identity->id, User::className(), 'ru'); + if(!empty(Yii::$app->request->post('Fields'))) { + Fields::saveFieldData(Yii::$app->request->post('Fields'), \Yii::$app->user->identity->id, User::className(), 'ru'); + } $user_info->load(\Yii::$app->request->post()); $user_info->save(); } diff --git a/frontend/web/js/fieldWidget.js b/frontend/web/js/fieldWidget.js index 2583d7f..fb16b34 100755 --- a/frontend/web/js/fieldWidget.js +++ b/frontend/web/js/fieldWidget.js @@ -1,6 +1,17 @@ -$(document).ready(function(){ - $('body').on('click', '.delete-field-item', function(){ +$(function(){ + $(document).on('click', '.delete-field-item', function(){ + var container = $(this).parents('.field_list').first(); $(this).parent('.form-group').remove(); - + var count = $(container).find('.form-group').length; + if(count <= 1) { + $(container).find('.delete-field-item').addClass('hidden'); + } }); -}); + $(document).on('click', '[class*=add_field_w]', function() { + var container = $(this).siblings('.field_list').first(); + var count = $(container).find('.form-group').length; + if(count > 1) { + $(container).find('.delete-field-item').removeClass('hidden'); + } + }); +}); \ No newline at end of file -- libgit2 0.21.4