staff: Cleanup staff-dept records on staff deletion

include/class.staff.php

@@ -692,6 +692,11 @@ implements AuthenticatedUser, EmailContact, TemplateVariable {
             ->filter(array('staff_id'=>$this->getId()))
             ->delete();
 
+        // Cleanup staff dept access
+        StaffDeptAccess::objects()
+            ->filter(array('staff_id'=>$this->getId()))
+            ->delete();
+
         return true;
     }
 

include/staff/department.inc.php

@@ -419,6 +419,8 @@ $('#add_extended_access').find('button').on('click', function() {
 if ($dept) {
     $members = $dept->members->all();
     foreach ($dept->extended as $x) {
+        if (!$x->staff)
+            continue;
         $members[] = new AnnotatedModel($x->staff, array(
             'alerts' => $x->isAlertsEnabled(),
             'role_id' => $x->role_id,