ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client/views: more thorough link fallbacks

Browse source 
Prevents a bunch of errors that can happen when a resource is deleted.
This commit is contained in:
Eva 2023-05-26 09:48:27 +02:00
parent 3f182a66ad
commit a16bb198ab
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/js/util/views.js
View file

@ -209,13 +209,13 @@ function makePostLink(id, includeHash) {
} }
function makeTagLink(name, includeHash, includeCount, tag) { function makeTagLink(name, includeHash, includeCount, tag) {
const category = tag ? tag.category : "unknown"; const category = tag && tag.category ? tag.category : "unknown";
let text = misc.getPrettyName(name); let text = misc.getPrettyName(name);
if (includeHash === true) { if (includeHash === true) {
text = "#" + text; text = "#" + text;
} }
if (includeCount === true) { if (includeCount === true) {
text += " (" + (tag ? tag.postCount : 0) + ")"; text += " (" + (tag && tag.postCount ? tag.postCount : 0) + ")";
} }
return api.hasPrivilege("tags:view") return api.hasPrivilege("tags:view")
? makeElement( ? makeElement(
@ -234,15 +234,15 @@ function makeTagLink(name, includeHash, includeCount, tag) {
} }
function makePoolLink(id, includeHash, includeCount, pool, name) { function makePoolLink(id, includeHash, includeCount, pool, name) {
const category = pool ? pool.category : "unknown"; const category = pool && pool.category ? pool.category : "unknown";
let text = misc.getPrettyName( let text = misc.getPrettyName(
name ? name : pool ? pool.names[0] : "unknown" name ? name : pool && pool.names ? pool.names[0] : "unknown"
); );
if (includeHash === true) { if (includeHash === true) {
text = "#" + text; text = "#" + text;
} }
if (includeCount === true) { if (includeCount === true) {
text += " (" + (pool ? pool.postCount : 0) + ")"; text += " (" + (pool && pool.postCount ? pool.postCount : 0) + ")";
} }
return api.hasPrivilege("pools:view") return api.hasPrivilege("pools:view")
? makeElement( ? makeElement(
@ -264,7 +264,7 @@ function makeUserLink(user) {
let text = makeThumbnail(user ? user.avatarUrl : null); let text = makeThumbnail(user ? user.avatarUrl : null);
text += user && user.name ? misc.escapeHtml(user.name) : "Anonymous"; text += user && user.name ? misc.escapeHtml(user.name) : "Anonymous";
const link = const link =
user && api.hasPrivilege("users:view") user && user.name && api.hasPrivilege("users:view")
? makeElement( ? makeElement(
"a", "a",
{ href: uri.formatClientLink("user", user.name) }, { href: uri.formatClientLink("user", user.name) },