Summary: | Album metadata sorted in non-deterministic way in some cases | ||
---|---|---|---|
Product: | [Applications] digikam | Reporter: | Michal Sylwester <msylwester> |
Component: | Albums-Sort | Assignee: | Digikam Developers <digikam-bugs-null> |
Status: | RESOLVED FIXED | ||
Severity: | minor | CC: | caulier.gilles, mohammed.ahmed.anwer |
Priority: | NOR | ||
Version: | 4.0.0 | ||
Target Milestone: | --- | ||
Platform: | Compiled Sources | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | 4.1.0 | |
Sentry Crash Report: |
Description
Michal Sylwester
2014-05-12 02:52:08 UTC
Mohamed, New entry from Michal, relevant of AlbumFilter implementation Gilles Caulier Git commit 64c44af9f6f2f0f172e12ca8f718b4acedb6dcc2 by Mohamed Anwer. Committed on 12/05/2014 at 21:00. Pushed by mohamedanwer into branch 'master'. Fixing CCBUG:334633 M +6 -0 libs/models/albumfiltermodel.cpp http://commits.kde.org/digikam/64c44af9f6f2f0f172e12ca8f718b4acedb6dcc2 diff --git a/libs/models/albumfiltermodel.cpp b/libs/models/albumfiltermodel.cpp index 9ec3a77..4ff57ce 100644 --- a/libs/models/albumfiltermodel.cpp +++ b/libs/models/albumfiltermodel.cpp @@ -372,6 +372,12 @@ bool AlbumFilterModel::lessThan(const QModelIndex& left, const QModelIndex& righ QVariant valRight = dataForCurrentSortRole(right); AlbumSettings::StringComparisonType strComparisonType = AlbumSettings::instance()->getStringComparisonType(); + AlbumSettings::AlbumSortOrder role = AlbumSettings::instance()->getAlbumSortOrder(); + + if((role == AlbumSettings::ByDate || role == AlbumSettings::ByCategory)&&(valLeft == valRight)) + { + return QSortFilterProxyModel::lessThan(left, right); + } if((valLeft.type() == QVariant::String) && (valRight.type() == QVariant::String)) { Mohamed, please use "BUG: xxxxxx" macro ALONE to close file automatically, not "Fixing ...." Gilles Caulier I tried to CC the commit to tell Mr Michal about the commit, and test the implementation then closing the entry. But it didn't send a CC ! CC is sent using "BUG: xxxxx" macro alone... Gilles |