Merge remote-tracking branch 'origin/master'

Yarik
2 parents 4f1adc01 01836820
Showing 6 changed files with 40 additions and 15 deletions Show diff stats
backend/assets/AppAsset.php
backend/web/js/fieldWidget.js
common/config/main-local.php
common/widgets/views/education_field.php
frontend/assets/AppAsset.php
frontend/web/js/fieldWidget.js
@@ -23,7 +23,8 @@ class AppAsset extends AssetBundle
         'css/flags32.css'
     ];
     public $js = [
-        'js/option.js'
+        'js/option.js',
+        'js/fieldWidget.js'
     ];
     public $depends = [
         'yii\web\JqueryAsset',
-$('body').on('click', '.delete-field-item', function(){
+$(document).ready(function(){
+    $('body').on('click', '.delete-field-item', function(){
-    $(this).parent('.form-group').remove();
+        $(this).parent('.form-group').remove();
-});
+    });
-$('.add_field').click(function(){
-    var block = $('.fields_video_result');
-    var sub_block = '<div class="form-group">'+
-        '<input type="text"   class="form-control" value="" name="Fields[video]['+ start_i++ +'][value]">'+
-        '<span data-id="none" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
-        '<div>';
-    block.append(sub_block);
+    $('.add_field').click(function(){
+        var block = $('.fields_video_result');
+        var sub_block = '<div class="form-group">'+
+            '<input type="text"   class="form-control" value="" name="Fields[video]['+ start_i++ +'][value]">'+
+            '<span data-id="none" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+            '<div>';
+        block.append(sub_block);
+
+    });
 });
 \ No newline at end of file
@@ -3,9 +3,9 @@ return [
     'components' => [
         'db' => [
             'class' => 'yii\db\Connection',
-            'dsn' => 'pgsql:host=localhost;port=5432;dbname=mfp_local',
-            'username' => 'postgres',
-            'password' => '',
+            'dsn' => 'pgsql:host=195.248.225.149;port=5432;dbname=mfp',
+            'username' => 'test33',
+            'password' => 'E4q2N7i9',
             'schemaMap' => [
                 'pgsql'=> [
                     'class'=>'yii\db\pgsql\Schema',
@@ -9,7 +9,9 @@ use yii\helpers\Html;
     <p class="btn btn-success add_field">Добавить поле</p>
-    <?php    $t = 0; for($i=1; $i <= count($model); $i++):
+    <?php
+    $t = 0;
+    for($i=1; $i <= count($model); $i++):
         $row = $i;
         ?>
@@ -34,6 +34,7 @@ class AppAsset extends AssetBundle
         '/js/forms.js',
         '/js/jquery.MultiFile.js',
         '/js/myGallery_min.js',
+        'js/fieldWidget.js'
     ];
     public $depends = [
         'yii\web\YiiAsset',
+$(document).ready(function(){
+    $('body').on('click', '.delete-field-item', function(){
+        console.log('sfddf');
+        $(this).parent('.form-group').remove();
+
+    });
+
+
+    $('.add_field').click(function(){
+        var block = $('.fields_video_result');
+        var sub_block = '<div class="form-group">'+
+            '<input type="text"   class="form-control" value="" name="Fields[video]['+ start_i++ +'][value]">'+
+            '<span data-id="none" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+            '<div>';
+        block.append(sub_block);
+
+    });
+});