gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-15 06:01:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-02-05 13:28:34 +01:00
commit c524add775
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -203,6 +203,7 @@
- overhaul notifications, type of receiver is now passed to notification - overhaul notifications, type of receiver is now passed to notification
service which allows a more fine grained filtering service which allows a more fine grained filtering
- show difference in number of documents on chart page - show difference in number of documents on chart page
- list users not Folder Notifiy page which has been disabled
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.21 Changes in version 5.1.21

5
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -1547,10 +1547,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
* notification for the folder * notification for the folder
* *
* @param integer $type type of notification (not yet used) * @param integer $type type of notification (not yet used)
* @param bool $incdisabled set to true if disabled user shall be included
* @return SeedDMS_Core_User[]|SeedDMS_Core_Group[]|bool array with a the elements 'users' and 'groups' which * @return SeedDMS_Core_User[]|SeedDMS_Core_Group[]|bool array with a the elements 'users' and 'groups' which
* contain a list of users and groups. * contain a list of users and groups.
*/ */
function getNotifyList($type=0) { /* {{{ */ function getNotifyList($type=0, $incdisabled=false) { /* {{{ */
if (empty($this->_notifyList)) { if (empty($this->_notifyList)) {
$db = $this->_dms->getDB(); $db = $this->_dms->getDB();
@ -1564,7 +1565,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
{ {
if ($row["userID"] != -1) { if ($row["userID"] != -1) {
$u = $this->_dms->getUser($row["userID"]); $u = $this->_dms->getUser($row["userID"]);
if($u && !$u->isDisabled()) if($u && (!$u->isDisabled() || $incdisabled))
array_push($this->_notifyList["users"], $u); array_push($this->_notifyList["users"], $u);
} else {//if ($row["groupID"] != -1) } else {//if ($row["groupID"] != -1)
$g = $this->_dms->getGroup($row["groupID"]); $g = $this->_dms->getGroup($row["groupID"]);

1
SeedDMS_Core/package.xml
View File

@ -1880,6 +1880,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
- add SeedDMS_Core_User->isType() and SeedDMS_Core_Group->isType() - add SeedDMS_Core_User->isType() and SeedDMS_Core_Group->isType()
- add SeedDMS_Core_User->getDMS() and SeedDMS_Core_Group->getDMS() - add SeedDMS_Core_User->getDMS() and SeedDMS_Core_Group->getDMS()
- add new parameter to SeedDMS_Core_DMS->getDocumentList() for skipping expired documents - add new parameter to SeedDMS_Core_DMS->getDocumentList() for skipping expired documents
- add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList()
</notes> </notes>
</release> </release>
<release> <release>

2
views/bootstrap/class.FolderNotify.php
View File

@ -71,7 +71,7 @@ $(document).ready(function() {
$allGroups = $this->params['allgroups']; $allGroups = $this->params['allgroups'];
$sortusersinlist = $this->params['sortusersinlist']; $sortusersinlist = $this->params['sortusersinlist'];
$notifyList = $folder->getNotifyList(); $notifyList = $folder->getNotifyList(0, true);
$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
$this->globalNavigation($folder); $this->globalNavigation($folder);