Skip to content
Snippets Groups Projects
Commit 23211458 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

fix ordering of news by priority, fixes #1636

Closes #1636

Merge request studip/studip!1448
parent cfd8022d
No related branches found
No related tags found
No related merge requests found
...@@ -103,9 +103,9 @@ class StudipNews extends SimpleORMap implements PrivacyObject ...@@ -103,9 +103,9 @@ class StudipNews extends SimpleORMap implements PrivacyObject
INNER JOIN news USING (news_id) INNER JOIN news USING (news_id)
WHERE range_id = ? {$clause} "; WHERE range_id = ? {$clause} ";
if (Config::get()->SORT_NEWS_BY_CHDATE) { if (Config::get()->SORT_NEWS_BY_CHDATE) {
$query .= "ORDER BY prio DESC, chdate DESC, date DESC, topic ASC"; $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, chdate DESC, date DESC, topic ASC";
} else { } else {
$query .= "ORDER BY prio DESC, date DESC, chdate DESC, topic ASC"; $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, date DESC, chdate DESC, topic ASC";
} }
$statement = DBManager::get()->prepare($query); $statement = DBManager::get()->prepare($query);
$statement->execute([$range_id]); $statement->execute([$range_id]);
...@@ -152,9 +152,9 @@ class StudipNews extends SimpleORMap implements PrivacyObject ...@@ -152,9 +152,9 @@ class StudipNews extends SimpleORMap implements PrivacyObject
FROM news FROM news
WHERE user_id = ? "; WHERE user_id = ? ";
if (Config::get()->SORT_NEWS_BY_CHDATE) { if (Config::get()->SORT_NEWS_BY_CHDATE) {
$query .= "ORDER BY prio DESC, chdate DESC, date DESC"; $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, chdate DESC, date DESC";
} else { } else {
$query .= "ORDER BY prio DESC, date DESC, chdate DESC"; $query .= "ORDER BY IF(prio = 0, 6, prio) prio DESC, date DESC, chdate DESC";
} }
$statement = DBManager::get()->prepare($query); $statement = DBManager::get()->prepare($query);
$statement->execute([$user_id]); $statement->execute([$user_id]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment