Merge branch 'integration_dev_master' of https://github.com/globocom/…

…GloboNetworkAPI.git into integration_dev_master
globocom · May 7, 2015 · 878f2df · 878f2df
2 parents 73f8e5e + 59af9cf
commit 878f2df
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/networkapi/eventlog/models.py b/networkapi/eventlog/models.py
@@ -79,7 +79,7 @@ def log(cls, usuario, evento):
 
     @classmethod
     def uniqueUsers(cls):
-        userlist = Usuario.objects.all()
+        userlist = Usuario.objects.all().order_by('user')
 
         return userlist
 

diff --git a/networkapi/eventlog/resource/EventLogChoiceResource.py b/networkapi/eventlog/resource/EventLogChoiceResource.py
@@ -81,7 +81,7 @@ def handle_post(self, request, user, *args, **kwargs):
 
             functionalities = Functionality.objects
 
-            acoes = ['Cadastrar', 'Alterar', 'Remover']
+            acoes = ['Alterar', 'Cadastrar', 'Remover']
             usuarios = EventLog.uniqueUsers()
 
             funcionalidades = functionalities.all()

diff --git a/networkapi/requisicaovips/models.py b/networkapi/requisicaovips/models.py
@@ -1621,8 +1621,7 @@ def save_vips_and_ports(self, vip_map, user):
                 ).uniqueResult()
 
             else:
-                raise Exception(
-                e, u'Unexpected error while searching for existing pool.')
+                raise RequisicaoVipsError(None, u'Unexpected error while searching for existing pool.')
 
             server_pool.default_port = default_port
             if healthcheck_obj != None:
@@ -1705,8 +1704,7 @@ def save_vips_and_ports(self, vip_map, user):
             elif server_pool_members.count() == 1:
                 server_pool_member = server_pool_members.uniqueResult()
             else:
-                raise Exception(
-                e, u'Unexpected error while searching for existing member.')
+                raise RequisicaoVipsError(None, u'Unexpected error while searching for existing pool.')
 
             server_pool_member.port_real = port_real
             server_pool_member.priority = priority