mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-12 20:51:30 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
d120b9eb7d
|
@ -275,7 +275,7 @@
|
||||||
- use SeedDMS_Core_File::mimetype() to determine mime type when uploading a
|
- use SeedDMS_Core_File::mimetype() to determine mime type when uploading a
|
||||||
file with drag&drop
|
file with drag&drop
|
||||||
- user images may be 300px height, do not scale them up
|
- user images may be 300px height, do not scale them up
|
||||||
>>>>>>> seeddms-5.1.x
|
- do not show unreadable documents on Dashboard
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
Changes in version 5.1.32
|
Changes in version 5.1.32
|
||||||
|
|
|
@ -77,6 +77,7 @@ class SeedDMS_View_Dashboard extends SeedDMS_Theme_Style {
|
||||||
|
|
||||||
echo $this->contentHeading(getMLText('new_documents'));
|
echo $this->contentHeading(getMLText('new_documents'));
|
||||||
$documents = $dms->getLatestChanges('newdocuments', mktime(0, 0, 0)-$dayspastdashboard*86400, time());
|
$documents = $dms->getLatestChanges('newdocuments', mktime(0, 0, 0)-$dayspastdashboard*86400, time());
|
||||||
|
$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
|
||||||
if (count($documents) > 0) {
|
if (count($documents) > 0) {
|
||||||
$this->printList($documents, $previewer);
|
$this->printList($documents, $previewer);
|
||||||
}
|
}
|
||||||
|
@ -101,6 +102,7 @@ class SeedDMS_View_Dashboard extends SeedDMS_Theme_Style {
|
||||||
|
|
||||||
echo $this->contentHeading(getMLText('updated_documents'));
|
echo $this->contentHeading(getMLText('updated_documents'));
|
||||||
$documents = $dms->getLatestChanges('updateddocuments', mktime(0, 0, 0)-$dayspastdashboard*86400, time());
|
$documents = $dms->getLatestChanges('updateddocuments', mktime(0, 0, 0)-$dayspastdashboard*86400, time());
|
||||||
|
$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
|
||||||
if (count($documents) > 0) {
|
if (count($documents) > 0) {
|
||||||
$this->printList($documents, $previewer);
|
$this->printList($documents, $previewer);
|
||||||
}
|
}
|
||||||
|
@ -125,6 +127,7 @@ class SeedDMS_View_Dashboard extends SeedDMS_Theme_Style {
|
||||||
|
|
||||||
echo $this->contentHeading(getMLText('status_change'));
|
echo $this->contentHeading(getMLText('status_change'));
|
||||||
$documents = $dms->getLatestChanges('statuschange', mktime(0, 0, 0)-$dayspastdashboard*86400, time());
|
$documents = $dms->getLatestChanges('statuschange', mktime(0, 0, 0)-$dayspastdashboard*86400, time());
|
||||||
|
$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
|
||||||
if (count($documents) > 0) {
|
if (count($documents) > 0) {
|
||||||
$this->printList($documents, $previewer);
|
$this->printList($documents, $previewer);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user