changes in topic list query and display of topic names
This commit is contained in:
+4
-4
@@ -229,13 +229,13 @@ func AmListTopics(ctx context.Context, confid int32, uid int32, viewOption int,
|
|||||||
if !ignoreSticky {
|
if !ignoreSticky {
|
||||||
tail = "(t.sticky = 1 OR " + tail + ")"
|
tail = "(t.sticky = 1 OR " + tail + ")"
|
||||||
}
|
}
|
||||||
whereClause = "t.archived = 0 AND hidden = 0 AND " + tail
|
whereClause = "t.archived = 0 AND (s.hidden IS NULL OR s.hidden = 0) AND " + tail
|
||||||
case TopicViewActive, TopicViewAllVisible:
|
case TopicViewActive, TopicViewAllVisible:
|
||||||
whereClause = "t.archived = 0 AND hidden = 0"
|
whereClause = "t.archived = 0 AND (s.hidden IS NULL OR s.hidden = 0)"
|
||||||
case TopicViewHidden:
|
case TopicViewHidden:
|
||||||
whereClause = "hidden = 1"
|
whereClause = "s.hidden = 1"
|
||||||
case TopicViewArchive:
|
case TopicViewArchive:
|
||||||
whereClause = "t.archived = 1 AND hidden = 0"
|
whereClause = "t.archived = 1 AND (s.hidden IS NULL OR s.hidden = 0)"
|
||||||
default:
|
default:
|
||||||
return nil, errors.New("invalid view option specified")
|
return nil, errors.New("invalid view option specified")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,7 +83,7 @@
|
|||||||
</td>
|
</td>
|
||||||
<td class="px-4 py-3 text-sm">
|
<td class="px-4 py-3 text-sm">
|
||||||
<a href="{{ urlStem }}/r/{{ t.Number }}"
|
<a href="{{ urlStem }}/r/{{ t.Number }}"
|
||||||
class="text-blue-700 hover:text-blue-900 font-medium">{{ t.Name }}</a>
|
class="text-blue-700 hover:text-blue-900 font-medium">{{ t.Name | raw }}</a>
|
||||||
</td>
|
</td>
|
||||||
<td class="px-4 py-3 whitespace-nowrap text-sm text-right">
|
<td class="px-4 py-3 whitespace-nowrap text-sm text-right">
|
||||||
<a href="{{ urlStem }}/r/{{ t.Number }}"
|
<a href="{{ urlStem }}/r/{{ t.Number }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user