[Fmsystem-commits] [15715]

[nelson . guerra]

Revision: 15715
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15715
Author:   nelson224
Date:     2016-09-22 02:44:55 +0000 (Thu, 22 Sep 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/js/portico/import_components.js

Modified: branches/dev-syncromind-2/property/js/portico/import_components.js
===================================================================
--- branches/dev-syncromind-2/property/js/portico/import_components.js  
2016-09-22 02:44:39 UTC (rev 15714)
+++ branches/dev-syncromind-2/property/js/portico/import_components.js  
2016-09-22 02:44:55 UTC (rev 15715)
@@ -121,11 +121,11 @@
                        processData: false,
                        data: form_data,
                        type: 'post',
-                       dataType: 'JSON',
+                       dataType: 'json',
                        success: function (result)
                        {
                                $('.processing-import-relations').hide();
-                               JqueryPortico.show_message(0, result);
+                               JqueryPortico.show_message(4, result);
                        }
                });
        });
@@ -167,6 +167,12 @@
                        type: 'post',
                        success: function (result)
                        {
+                               $('.processing-import').hide();
+                               if (typeof(result.error) !== 'undefined')
+                               {
+                                       JqueryPortico.show_message(1, result);
+                                       return;
+                               }
                                var $el = $("#sheet_id");
                                $el.empty();
                                $el.append($("<option></option>").attr("value", 
'').text('Select Sheet'));
@@ -175,8 +181,6 @@
                                {
                                        
$el.append($("<option></option>").attr("value", v.id).text(v.name));
                                });
-                               $('.processing-import').hide();
-                               //JqueryPortico.show_message(1, result);
                        }
                });
        });
@@ -204,10 +208,15 @@
                
                JqueryPortico.execute_ajax(requestUrl,
                        function(result){
+                               $('.processing-sheet').hide();
+                               if (typeof(result.error) !== 'undefined')
+                               {
+                                       JqueryPortico.show_message(1, result);
+                                       return;
+                               }
                                $('#content_lines').html(result);
                                
$('#responsiveTabsDemo').responsiveTabs('enable', 1);
-                               
$('#responsiveTabsDemo').responsiveTabs('activate', 1);
-                               $('.processing-sheet').hide();
+                               
$('#responsiveTabsDemo').responsiveTabs('activate', 1);                         
                        }, data, "GET", "json"
                );
        });
@@ -236,10 +245,15 @@
                
                JqueryPortico.execute_ajax(requestUrl,
                        function(result){
+                               $('.processing-start-line').hide();
+                               if (typeof(result.error) !== 'undefined')
+                               {
+                                       JqueryPortico.show_message(1, result);
+                                       return;
+                               }
                                $('#content_columns').html(result);
                                
$('#responsiveTabsDemo').responsiveTabs('enable', 2);
-                               
$('#responsiveTabsDemo').responsiveTabs('activate', 2);
-                               $('.processing-start-line').hide();
+                               
$('#responsiveTabsDemo').responsiveTabs('activate', 2);                         
                        }, data, "GET", "json"
                );
        });
@@ -255,7 +269,6 @@
                        return false;
                }
                
-               
                var data = {
                        "step": 4,
                        "sheet_id": $('#sheet_id').val(), 
@@ -351,7 +364,6 @@
                                
                                
$('#responsiveTabsDemo').responsiveTabs('enable', 3);
                                
$('#responsiveTabsDemo').responsiveTabs('activate', 3);
-                               JqueryPortico.show_message(2, result);
                                
                                $('#new_entity_categories').empty();
                                if (typeof(result.new_entity_categories) !== 
'undefined')