Browse Source

CustomCategory: when no name set, use 'Custom ID' as name

master
parent
commit
228a24a506
  1. 10
      src/customCategory.js
  2. 11
      src/customCategory.php

10
src/customCategory.js

@ -25,7 +25,13 @@ class CustomCategoryRepository {
}
ajax('customCategory', { id }, (result) => {
callback(null, yaml.load(result))
const data = yaml.load(result)
if (Object.is(data) && !('name' in data)) {
data.name = 'Custom ' + id.substr(0, 6)
}
callback(null, data)
})
}
@ -200,7 +206,7 @@ function customCategoriesList (browser, options) {
const a = document.createElement('a')
a.href = '#categories=custom/' + cat.id
a.appendChild(document.createTextNode(cat.id))
a.appendChild(document.createTextNode(cat.name))
li.appendChild(a)
const edit = document.createElement('a')

11
src/customCategory.php

@ -15,8 +15,19 @@ function ajax_customCategory ($param) {
$data = array_map(function ($d) {
$d['popularity'] = (float)$d['popularity'];
$d['accessCount'] = (int)$d['accessCount'];
$content = yaml_parse($d['content']);
if ($content && is_array($content) && array_key_exists('name', $content)) {
$d['name'] = lang($content['name']);
}
else {
$d['name'] = 'Custom ' . substr($d['id'], 0, 6);
}
unset($d['content']);
return $d;
}, $data);
$stmt->closeCursor();
return $data;
}

Loading…
Cancel
Save