Merge branch 'develop' into refactoring

src/libs/services/database/include/services/database/Object.hpp

@@ -34,6 +34,8 @@ namespace Database
 			const T* operator->() const { return _obj.get(); }
 			operator bool() const { return _obj.get(); }
 			bool operator!() const { return !_obj.get(); }
+			bool operator==(const ObjectPtr& other) const { return _obj == other._obj; }
+			bool operator!=(const ObjectPtr& other) const { return other._obj != _obj; }
 
 			auto modify() { return _obj.modify(); }
 			void remove() { _obj.remove(); }

src/libs/services/database/test/Track.cpp

@@ -46,7 +46,21 @@ TEST_F(DatabaseFixture, Track)
 	}
 }
 
-TEST_F(DatabaseFixture, Track_findByKeywords)
+TEST_F(DatabaseFixture, MultipleTracks)
+{
+	ScopedTrack track1 {session, "MyTrackFile1"};
+	ScopedTrack track2 {session, "MyTrackFile2"};
+
+	{
+		auto transaction {session.createSharedTransaction()};
+
+		EXPECT_TRUE(track1.getId() != track2.getId());
+		EXPECT_TRUE(track1.get() != track2.get());
+		EXPECT_FALSE(track1.get() == track2.get());
+	}
+}
+
+TEST_F(DatabaseFixture, MultipleTracksSearchByFilter)
 {
 	ScopedTrack track1 {session, ""};
 	ScopedTrack track2 {session, ""};

src/lms/ui/admin/UsersView.cpp

@@ -71,6 +71,7 @@ UsersView::refreshView()
 
 	auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
+	const User::IdType currentUserId {LmsApp->getUser()};
 	for (const UserId userId : User::find(LmsApp->getDbSession(), User::FindParameters {}).results)
 	{
 		const User::pointer user {User::find(LmsApp->getDbSession(), userId)};
@@ -87,7 +88,7 @@ UsersView::refreshView()
 		}
 
 		// Don't edit ourself this way
-		if (LmsApp->getUser() == user)
+		if (user->getId() == currentUserId)
 			continue;
 
 		entry->setCondition("if-edit", true);