Actually toggle active membership

Author: mbillow

conditional/blueprints/member_management.py

@@ -25,6 +25,7 @@
 from conditional.util.ldap import ldap_is_financial_director
 from conditional.util.ldap import ldap_set_roomnumber
 from conditional.util.ldap import ldap_set_active
+from conditional.util.ldap import ldap_set_inactive
 from conditional.util.ldap import ldap_set_housingpoints
 from conditional.util.ldap import ldap_get_room_number
 from conditional.util.ldap import ldap_get_housing_points
@@ -242,7 +243,10 @@ def member_management_edituser(uid):
         # Only update if there's a diff
         logger.info('backend', action="edit %s active: %s" % (uid, active_member))
         if ldap_is_active(uid) != active_member:
-            ldap_set_active(uid)
+            if active_member:
+                ldap_set_active(uid)
+            else:
+                ldap_set_inactive(uid)
 
             if active_member:
                 db.session.add(SpringEval(uid))

conditional/util/ldap.py

@@ -119,7 +119,7 @@ def __ldap_remove_member_from_group__(username, group):
     ldap_conn.modify_s(groupdn, ldap_modlist)
 
 
-@ldap_init_required
+# @ldap_init_required
 def __ldap_is_member_of_committee__(username, committee):
     ldap_results = ldap_conn.search_s(committee_search_ou, ldap.SCOPE_SUBTREE,
                                       "(cn=%s)" % committee)
@@ -130,51 +130,51 @@ def __ldap_is_member_of_committee__(username, committee):
            [x.decode('ascii') for x in ldap_results[0][1]['head']]
 
 
-@lru_cache(maxsize=1024)
+# @lru_cache(maxsize=1024)
 def ldap_get_housing_points(username):
     return int(__ldap_get_field__(username, 'housingPoints'))
 
 
-@lru_cache(maxsize=1024)
+# @lru_cache(maxsize=1024)
 def ldap_get_room_number(username):
     roomno = __ldap_get_field__(username, 'roomNumber')
     if roomno is None:
         return "N/A"
     return roomno.decode('utf-8')
 
 
-@lru_cache(maxsize=1024)
+# @lru_cache(maxsize=1024)
 def ldap_get_active_members():
     return [x for x in ldap_get_current_students()
             if ldap_is_active(x['uid'][0].decode('utf-8'))]
 
 
-@lru_cache(maxsize=1024)
+# @lru_cache(maxsize=1024)
 def ldap_get_intro_members():
     return [x for x in ldap_get_current_students()
             if ldap_is_intromember(x['uid'][0].decode('utf-8'))]
 
 
-@lru_cache(maxsize=1024)
+# @lru_cache(maxsize=1024)
 def ldap_get_non_alumni_members():
     return [x for x in ldap_get_current_students()
             if ldap_is_alumni(x['uid'][0].decode('utf-8'))]
 
 
-@lru_cache(maxsize=1024)
+# @lru_cache(maxsize=1024)
 def ldap_get_onfloor_members():
     return [x for x in ldap_get_current_students()
             if ldap_is_onfloor(x['uid'][0].decode('utf-8'))]
 
 
-@lru_cache(maxsize=1024)
+# @lru_cache(maxsize=1024)
 def ldap_get_current_students():
     return [x[1]
             for x in __ldap_get_members__()[1:]
             if ldap_is_current_student(str(str(x[0]).split(",")[0]).split("=")[1])]
 
 
-@lru_cache(maxsize=1024)
+# @lru_cache(maxsize=1024)
 def ldap_is_active(username):
     return __ldap_is_member_of_group__(username, 'active')
 
@@ -226,6 +226,10 @@ def ldap_set_active(username):
     __ldap_add_member_to_group__(username, 'active')
 
 
+def ldap_set_inactive(username):
+    __ldap_remove_member_from_group__(username, 'active')
+
+
 @lru_cache(maxsize=1024)
 def ldap_get_name(username):
     first = __ldap_get_field__(username, 'givenName')