[Fmsystem-commits] [14060]

[Nelson Guerra]

Revision: 14060
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14060
Author:   nelson224
Date:     2015-09-29 22:46:53 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/rental/js/rental/resultunit.edit.js

Modified: branches/dev-syncromind/rental/js/rental/resultunit.edit.js
===================================================================
--- branches/dev-syncromind/rental/js/rental/resultunit.edit.js 2015-09-29 
22:46:39 UTC (rev 14059)
+++ branches/dev-syncromind/rental/js/rental/resultunit.edit.js 2015-09-29 
22:46:53 UTC (rev 14060)
@@ -9,29 +9,35 @@
        var oArgs = {menuaction:'rental.uiresultunit.search_user'};
        var requestUrl = phpGWLink('index.php', oArgs, true);
        
+       $('.loading').css( {"visibility" : "visible"} );
+       
        var data = {"username": document.getElementById('username').value};
        JqueryPortico.execute_ajax(requestUrl, function(result){
                
-                       document.getElementById('message').innerHTML = '';
+                       document.getElementById('custom_message').innerHTML = 
'';
 
                        if (typeof(result.message) !== 'undefined')
                        {
-                               document.getElementById('message').innerHTML = 
result.message.msg;
+                               
document.getElementById('custom_message').innerHTML = result.message.msg;
                        }
 
                        if (typeof(result.error) !== 'undefined')
                        {
-                               document.getElementById('message').innerHTML = 
result.error.msg;
+                               
document.getElementById('custom_message').innerHTML = result.error.msg;
                        }
-       
-                       document.getElementById('username').value = 
result.data.username;
-                       document.getElementById('firstname').value = 
result.data.firstname;
-                       document.getElementById('lastname').value = 
result.data.lastname;
-                       if (typeof(result.data.email) !== 'undefined')
+
+                       if (typeof(result.data) !== 'undefined')
                        {
-                               document.getElementById('email').value = 
result.data.email;
+                               document.getElementById('username').value = 
result.data.username;
+                               document.getElementById('firstname').value = 
result.data.firstname;
+                               document.getElementById('lastname').value = 
result.data.lastname;
+                               if (typeof(result.data.email) !== 'undefined')
+                               {
+                                       document.getElementById('email').value 
= result.data.email;
+                               }
+                               document.getElementById('account_id').value = 
result.data.account_id;
                        }
-                       document.getElementById('account_id').value = 
result.data.account_id;
+                       $('.loading').css( {"visibility" : "hidden"} );
                        
        }, data, "POST", "JSON");               
 }
@@ -51,6 +57,8 @@
        data['level'] = document.getElementById('unit_level').value;
        data['account_id'] = document.getElementById('account_id').value;
        
+       $('.loading').css( {"visibility" : "visible"} );
+       
        JqueryPortico.execute_ajax(requestUrl, function(result){
                
                        document.getElementById('message0').innerHTML = '';
@@ -72,6 +80,8 @@
                        document.getElementById('account_id').value = '';
                        document.getElementById('message').innerHTML = '';
                        
+                       $('.loading').css( {"visibility" : "hidden"} );
+                       
                        oTable0.fnDraw();
                        
        }, data, "POST", "JSON");