Merge remote-tracking branch 'origin/master'

Виталий
2 parents 5aefd508 5346fcf9
Showing 5 changed files with 48 additions and 20 deletions Show diff stats
backend/web/js/fieldWidget.js
common/models/UserInfo.php
common/widgets/views/site_field.php
frontend/controllers/AccountsController.php
frontend/web/js/fieldWidget.js
-$(document).ready(function(){
-    $('body').on('click', '.delete-field-item', function(){
-
-        $(this).parent('.form-group').remove();
-
-    });
-
-
-});
 \ No newline at end of file
@@ -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]+\/?$/',
+                ],
             ];
         }
@@ -19,7 +19,7 @@ use yii\helpers\Html;
         <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
             <div class="input-blocks">
                 <label for="cont-site-<?= ++$label ?>">Сайт</label>
-                <input id="cont-site-<?= $label  ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" />
+                <input id="cont-site-<?= $label  ?>" type="url" placeholder="http://" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" />
             </div>
             <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
         <?= Html::endTag('div')?>
@@ -41,7 +41,7 @@ use yii\helpers\Html;
                 '<div class="input-blocks">'+
                 '<label for="cont-site-' + ++start_label_<?=$this->context->id?> +'">Сайт</label>'+
-                '<input id="cont-site-' + start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+
+                '<input id="cont-site-' + start_label_<?=$this->context->id?> +'" type="url" placeholder="http://" class="form-control custom-input-2" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+
                 '</div>'+
                 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
                 '<div>';
@@ -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();
             }
-$(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