mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #493 from th-h/thh-dashboard-entries

Browse Source 
Dashboard: redo display of drafts / future entries
This commit is contained in:
onli 2017-04-15 12:01:21 +02:00 committed by GitHub
commit e1733604a5
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/admin/overview.inc.php
View File

@ -52,17 +52,6 @@ $data['update'] = version_compare($data['usedVersion'], $data['curVersion'
serendipity_plugin_api::hook_event('plugin_dashboard_updater', $output, $data['curVersion']);
$data['updateButton'] = $output;
// Can be set through serendipity_config_local.inc.php
if (!isset($serendipity['dashboardCommentsLimit'])) {
$serendipity['dashboardCommentsLimit'] = 5;
}
if (!isset($serendipity['dashboardLimit'])) {
$serendipity['dashboardLimit'] = 5;
}
if (!isset($serendipity['dashboardDraftLimit'])) {
$serendipity['dashboardDraftLimit'] = 5;
}
$cjoin = ($serendipity['serendipityUserlevel'] == USERLEVEL_EDITOR) ? "
LEFT JOIN {$serendipity['dbPrefix']}authors a ON (e.authorid = a.authorid)
WHERE e.authorid = " . (int)$serendipity['authorid']
@ -97,7 +86,7 @@ $efilter = ($serendipity['serendipityUserlevel'] == USERLEVEL_EDITOR) ? ' AND e.
$entries = serendipity_fetchEntries(
false,
false,
(int)$serendipity['dashboardLimit'],
(int)$serendipity['dashboardEntriesLimit'],
true,
false,
'timestamp DESC',
@ -108,12 +97,12 @@ $entriesAmount = 0;
if (is_array($entries)) {
$entriesAmount = count($entries);
};
if ($entriesAmount < (int)$serendipity['dashboardDraftLimit']) {
if ($entriesAmount < (int)$serendipity['dashboardEntriesLimit']) {
// there is still space for drafts
$drafts = serendipity_fetchEntries(
false,
false,
(int)$serendipity['dashboardDraftLimit'] - $entriesAmount,
(int)$serendipity['dashboardEntriesLimit'] - $entriesAmount,
true,
false,
'timestamp DESC',

9
serendipity_config.inc.php
View File

@ -144,6 +144,15 @@ if (!isset($serendipity['backendBlogtitleFirst'])) {
$serendipity['backendBlogtitleFirst'] = false;
}
// Dashboard: set number of comments and drafts / future entries to be shown
if (!isset($serendipity['dashboardCommentsLimit'])) {
$serendipity['dashboardCommentsLimit'] = 5;
}
if (!isset($serendipity['dashboardEntriesLimit'])) {
$serendipity['dashboardEntriesLimit'] = 5;
}
// Available languages
if (!isset($serendipity['languages'])) {
$serendipity['languages'] = array('en' => 'English',