From: Dan Scott <dscott@laurentian.ca>
Date: Tue, 17 Jan 2017 14:33:48 +0000 (-0500)
Subject: Prefer primary affiliation over student level
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=83c71829d07a75713e60dafab8ea030ea9f7511b;p=contrib%2FConifer.git

Prefer primary affiliation over student level

When figuring out the intended profile for a given account, let primary
affiliation win; we have accounts that started as students and are now back as
faculty, and the lulStudentLevel still identifies them as undergrads. That
ain't right!

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/tools/patron-load/ldap_osrf_sync b/tools/patron-load/ldap_osrf_sync
index 929732c995..f1ec1154eb 100755
--- a/tools/patron-load/ldap_osrf_sync
+++ b/tools/patron-load/ldap_osrf_sync
@@ -195,7 +195,7 @@ class User:
             'visitor': 113
         }
 
-        for att in ('lulStudentLevel', 'lulPrimaryAffiliation', 'lulAffiliation'):
+        for att in ('lulPrimaryAffiliation', 'lulStudentLevel', 'lulAffiliation'):
             if att in self.ldap_atts:
                 affiliation = self._simple_map(att).lower()
                 if affiliation in profile_map: