exclude wp members from Principal.memberships

That way, they no longer show up on the administration page of user`s projects

app/models/principal.rb

@@ -49,7 +49,8 @@ class Principal < ApplicationRecord
   has_many :memberships,
            -> {
              includes(:project, :roles)
-               .where(["projects.active = ? OR project_id IS NULL", true])
+               .where(entity: nil)
+               .where(["projects.active = ? OR members.project_id IS NULL", true])
                .order(Arel.sql('projects.name ASC'))
              # haven't been able to produce the order using hashes
            },

spec/models/principal_spec.rb

@@ -91,4 +91,41 @@ def self.should_return_groups_and_users_if_active(method, *)
       expect(described_class.not_locked.where(id: user.id)).to eq([user])
     end
   end
+
+  describe '.memberships' do
+    let(:project_role) { create(:project_role) }
+    let(:global_role) { create(:global_role) }
+    let(:work_package_role) { create(:view_work_package_role) }
+    let(:user) { create(:user) }
+    let!(:active_project_member) do
+      create(:member,
+             principal: user,
+             project: create(:project),
+             roles: [project_role])
+    end
+    let!(:inactive_project_member) do
+      create(:member,
+             principal: user,
+             project: create(:project, active: false),
+             roles: [project_role])
+    end
+    let!(:global_member) do
+      create(:member,
+             principal: user,
+             project: nil,
+             roles: [global_role])
+    end
+    let!(:work_package_member) do
+      create(:work_package_member,
+             principal: user,
+             project: create(:project),
+             entity: create(:work_package),
+             roles: [work_package_role])
+    end
+
+    it 'returns all active projects and global members' do
+      expect(user.memberships)
+        .to contain_exactly(active_project_member, global_member)
+    end
+  end
 end