Merge pull request #99 from ojonathacardoso/master

Correção para correta adição dos cadastros de Contato

saap/globalrules/crud_custom.py

@@ -290,22 +290,22 @@ def form_valid(self, form):
 
             if self.container_field:
                 container = self.container_field.split('__')
-                print(getattr(self.model, container[0]).field.related_model)
 
                 if len(container) > 1:
-                    #container_model = getattr(
-                    #    self.model, container[0]).field.related_model
+                    container_model = getattr(
+                        self.model, container[0]).field.related_model
 
-                    #params = {}
-                    #params['__'.join(
-                    #    container[1:])] = self.request.user.pk
+                    params = {}
+                    params['__'.join(
+                        container[1:])] = self.request.user.pk
 
-                    #if 'pk' in self.kwargs:
-                    #    params['pk'] = self.kwargs['pk']
+                    if 'pk' in self.kwargs:
+                        params['pk'] = self.kwargs['pk']
 
-                    container_data = OperadorAreaTrabalho.objects.filter(user=self.request.user.pk, preferencial=True)[0].areatrabalho
-                    #container_data = container_model.objects.filter(
-                    #   **params).first()
+                    if str(container_model).find('AreaTrabalho') >= 0:   
+                        container_data = OperadorAreaTrabalho.objects.filter(user=self.request.user.pk, preferencial=True)[0].areatrabalho
+                    else:
+                        container_data = container_model.objects.filter(**params).first()
 
                     if not container_data:
                         raise Exception(