mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-03-12 08:55:54 +00:00
inform the subscribers of parent folder if a folder is deleted.
Till now, this only happend when document was deleted
This commit is contained in:
parent
39d7ed97b1
commit
fc030cd4e2
|
@ -347,7 +347,12 @@ switch($command) {
|
||||||
if($folder) {
|
if($folder) {
|
||||||
if ($folder->getAccessMode($user, 'removeFolder') >= M_READWRITE) {
|
if ($folder->getAccessMode($user, 'removeFolder') >= M_READWRITE) {
|
||||||
$parent=$folder->getParent();
|
$parent=$folder->getParent();
|
||||||
$nl = $folder->getNotifyList();
|
$fnl = $folder->getNotifyList();
|
||||||
|
$pnl = $parent->getNotifyList();
|
||||||
|
$nl = array(
|
||||||
|
'users'=>array_merge($fnl['users'], $pnl['users']),
|
||||||
|
'groups'=>array_merge($fnl['groups'], $pnl['groups'])
|
||||||
|
);
|
||||||
$foldername = $folder->getName();
|
$foldername = $folder->getName();
|
||||||
if($folder->remove()) {
|
if($folder->remove()) {
|
||||||
if ($notifier) {
|
if ($notifier) {
|
||||||
|
|
|
@ -75,7 +75,9 @@ require_once("SeedDMS/Preview.php");
|
||||||
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
|
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
|
||||||
$previewer->deleteDocumentPreviews($document);
|
$previewer->deleteDocumentPreviews($document);
|
||||||
|
|
||||||
/* Get the notify list before removing the document */
|
/* Get the notify list before removing the document
|
||||||
|
* Also inform the users/groups of the parent folder
|
||||||
|
*/
|
||||||
$dnl = $document->getNotifyList();
|
$dnl = $document->getNotifyList();
|
||||||
$fnl = $folder->getNotifyList();
|
$fnl = $folder->getNotifyList();
|
||||||
$nl = array(
|
$nl = array(
|
||||||
|
|
|
@ -71,10 +71,17 @@ require_once("SeedDMS/Preview.php");
|
||||||
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
|
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
|
||||||
$dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer));
|
$dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer));
|
||||||
|
|
||||||
/* save this for notification later on */
|
/* Get the notify list before removing the folder
|
||||||
$nl = $folder->getNotifyList();
|
* Also inform the users/groups of the parent folder
|
||||||
|
*/
|
||||||
$parent=$folder->getParent();
|
$parent=$folder->getParent();
|
||||||
$foldername = $folder->getName();
|
$foldername = $folder->getName();
|
||||||
|
$fnl = $folder->getNotifyList();
|
||||||
|
$pnl = $parent->getNotifyList();
|
||||||
|
$nl = array(
|
||||||
|
'users'=>array_merge($fnl['users'], $pnl['users']),
|
||||||
|
'groups'=>array_merge($fnl['groups'], $pnl['groups'])
|
||||||
|
);
|
||||||
|
|
||||||
$controller->setParam('folder', $folder);
|
$controller->setParam('folder', $folder);
|
||||||
$controller->setParam('index', $index);
|
$controller->setParam('index', $index);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user