From 02578f19d90ed5a11a10a7103d0cca197cb8d45f Mon Sep 17 00:00:00 2001
From: Vittorio Schiavone <info@snakelabs.it>
Date: Wed, 17 May 2017 00:31:09 +0200
Subject: [PATCH] fix modal edit

---
 .../la/accounts/modal/contact_edit.blade.php  |  4 +---
 .../views/la/accounts/tabs/contacts.blade.php | 24 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/resources/views/la/accounts/modal/contact_edit.blade.php b/resources/views/la/accounts/modal/contact_edit.blade.php
index 571af13..0f2c5e5 100644
--- a/resources/views/la/accounts/modal/contact_edit.blade.php
+++ b/resources/views/la/accounts/modal/contact_edit.blade.php
@@ -10,14 +10,13 @@
 
 
             <div class="modal-body">
+                {!! form::open(['url' => '#', 'method' => 'post', 'id' => 'updateModalForm']) !!}
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <input type="hidden" id="contactId" value="">
-                <input type="hidden" id="urlController" value="{{ url(config('laraadmin.adminRoute')) }}"=>
                 {{-- <form id="formDati" class="form-horizontal" role="form"> --}}
                 {{-- {!! Form::open(['action' => ['LA\ContactsController@updateModal',1], 'id' => 'contact-edit-modal-form']) !!} --}}
                 {{-- {!! Form::model($contact, ['method'=>'put', 'url' => config('laraadmin.adminRoute') . '/contacts/'. $contact->id,  'id' => 'contact-update-form']) !!} --}}
                 {{-- {!! Form::model($contact, ['route' => [config('laraadmin.adminRoute') . '.updateModalContact', 1 ], 'method'=>'PUT', 'id' => 'contact-update-form']) !!} --}}
-                {!! form::open(['url' => '#', 'method' => 'post']) !!}
                     <div class="box-body">
                         @php ($fields = array('title_id','contact_type_id','office_id','first_name','last_name','notes'))
                         @la_formMultiple("Contacts", $fields)
@@ -32,7 +31,6 @@
                         @la_input($module, 'account_user')
                         --}}
                     </div>
-                    {!! Form::submit( 'Submit', ['class'=>'btn btn-success']) !!}
                 {!! Form::close() !!}
                 {{-- </form> --}}
                 {{-- {!! Form::submit( 'Submit', ['class'=>'btn btn-success', 'id'=>'btn_submit']) !!} --}}
diff --git a/resources/views/la/accounts/tabs/contacts.blade.php b/resources/views/la/accounts/tabs/contacts.blade.php
index 7860725..008f91e 100644
--- a/resources/views/la/accounts/tabs/contacts.blade.php
+++ b/resources/views/la/accounts/tabs/contacts.blade.php
@@ -69,12 +69,12 @@
         $("#contact-panel .editModalBtn").on("click", function() {
             var info = JSON.parse($(this).attr("info"));
 
-            var url = $("#contact-update-form").attr("action");
-            index = url.lastIndexOf("/");
-            url2 = url.substring(0, index+1)+info.id;
+            //var url = $("#contact-update-form").attr("action");
+            //index = url.lastIndexOf("/");
+            //url2 = url.substring(0, index+1)+info.id;
 
             // $("#contact-update-form").attr("action", url2)
-
+/*
             $.ajax({
                 url: $("#urlController").val()+'/editModalContact/'+info.id,
                 method: 'GET',
@@ -93,12 +93,12 @@
                     console.log(errors);
                     // Render the errors with js ...
                 }
-            });
+            });*/
             $('#contactId').val(info.id);
             $.each(info, function(index, value) {
                 $("#EditModal input[name="+index+"]").val(value);
             });
-            $("#contact-update-form").attr("action", url2)
+            //$("#contact-update-form").attr("action", url2)
 
             $("#EditModal").modal("show");
             // var url = $("#contact-update-form").attr("action");
@@ -113,19 +113,20 @@
             e.preventDefault();
             // console.log($("#contactId").val());
             var contactId = $("#contactId").val();
-            var first_name = $("#formDati input[name=first_name]").val();
-            var newURL = '{{route(config('laraadmin.adminRoute') . '.updateModalContact',1)}}';
+            //var first_name = $("#formDati input[name=first_name]").val();
+            var newURL = '/{{ config('laraadmin.adminRoute') }}/updateModalContact/'+contactId;
             console.log('qui');
             $.ajax({
                 // url: $("#urlController").val()+'/updateModalContact/'+contactId,
                 url: newURL,
                 type: 'POST',
-                // data: {
-                //     'first_name': first_name,
-                // },
+                data: jQuery("#updateModalForm").serialize(),
                 success: function(data){
                     console.log(data);
                     // $('#contact_panel_'+contactId).load(location.href + ' #contact_panel_'+contactId);
+
+                    // Nasconde la modale SOLO se il salvataggio viene effettuato correttamente
+                    $('#EditModal').modal('hide');
                 },
                 error: function(data){
                     var errors = data.responseJSON;
@@ -133,7 +134,6 @@
                     // Render the errors with js ...
                 }
             });
-            $('#EditModal').modal('hide');
         });
     });