Merge pull request #445 from epigen-UCSD/tm

a bug in research and fiscal person saving through add samples page
epigen-UCSD · Jul 1, 2020 · d0585ba · d0585ba
2 parents 4c61be7 + 389c3b7
commit d0585ba
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/masterseq_app/views.py b/masterseq_app/views.py
@@ -416,7 +416,7 @@ def SamplesCreateView(request):
                     user_first_name = resname.split(' ')[0]
                     user_last_name = resname.split(' ')[-1]
                     if resphone:
-                        if resphone not in resperson.phone:
+                        if not resperson.phone or resphone not in resperson.phone:
                             newinforequired = 1
                             newresinfoflag = 1
                             new_phone = resphone
@@ -433,7 +433,7 @@ def SamplesCreateView(request):
                         newresinfoflag = 1
                         new_email = resemail
                         if resphone:
-                            if resphone not in resperson.phone:
+                            if not resperson.phone or resphone not in resperson.phone:
                                 new_phone = resphone
 
                     except:
@@ -460,7 +460,7 @@ def SamplesCreateView(request):
                     newresinfoflag = 1
                     new_email = ''
                     if resphone:
-                        if resphone not in resperson.phone:
+                        if not resperson.phone or resphone not in resperson.phone:
                             new_phone = resphone
                 except:
                     newuserrequired = 1
@@ -489,7 +489,7 @@ def SamplesCreateView(request):
                     fisuser_first_name = fisname.split(' ')[0]
                     fisuser_last_name = fisname.split(' ')[-1]
                     if indname:
-                        if indname not in fisperson.index:
+                        if not fisperson.index or indname not in fisperson.index:
                             newinforequired = 1
                             newfisinfoflag = 1
                             fisnew_index = indname
@@ -506,7 +506,7 @@ def SamplesCreateView(request):
                         newfisinfoflag = 1
                         fisnew_email = fisemail
                         if indname:
-                            if indname not in fisperson.index:
+                            if not fisperson.index or indname not in fisperson.index:
                                 fisnew_index = indname
 
                     except:
@@ -533,7 +533,7 @@ def SamplesCreateView(request):
                     newfisinfoflag = 1
                     fisnew_email = ''
                     if indname:
-                        if indname not in fisperson.index:
+                        if not fisperson.index or indname not in fisperson.index:
                             fisnew_index = indname
                 except:
                     newuserrequired = 1