gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-10 19:12:42 +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 2020-10-05 17:15:09 +02:00
commit 73fe0e37ff
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,9 +465,13 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
*/ */
function getDefaultAccess() { /* {{{ */ function getDefaultAccess() { /* {{{ */
if ($this->inheritsAccess()) { if ($this->inheritsAccess()) {
/* Access is supposed to be inherited but it could be that there
* is no parent because the configured root folder id is somewhere
* below the actual root folder.
*/
$res = $this->getParent(); $res = $this->getParent();
if (!$res) return false; if ($res)
return $this->_parent->getDefaultAccess(); return $this->_parent->getDefaultAccess();
} }
return $this->_defaultAccess; return $this->_defaultAccess;
@ -1227,10 +1231,15 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
$db = $this->_dms->getDB(); $db = $this->_dms->getDB();
if ($this->inheritsAccess()) { if ($this->inheritsAccess()) {
/* Access is supposed to be inherited but it could be that there
* is no parent because the configured root folder id is somewhere
* below the actual root folder.
*/
$res = $this->getParent(); $res = $this->getParent();
if (!$res) return false; if ($res) {
$pacl = $res->getAccessList($mode, $op); $pacl = $res->getAccessList($mode, $op);
return $pacl; return $pacl;
}
} else { } else {
$pacl = array("groups" => array(), "users" => array()); $pacl = array("groups" => array(), "users" => array());
} }

21
SeedDMS_Core/package.xml
View File

@ -15,8 +15,8 @@
<date>2020-09-29</date> <date>2020-09-29</date>
<time>13:44:55</time> <time>13:44:55</time>
<version> <version>
<release>6.0.13</release> <release>6.0.14</release>
<api>6.0.13</api> <api>6.0.14</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -24,7 +24,6 @@
</stability> </stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
See release 5.1.20
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">
@ -2090,5 +2089,21 @@ SeedDMS_Core_DMS::filterAccess() properly checks for documents
<notes> <notes>
</notes> </notes>
</release> </release>
<release>
<date>2020-09-29</date>
<time>13:44:55</time>
<version>
<release>6.0.13</release>
<api>6.0.13</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- SeedDMS_Folder_DMS::getAccessList() and getDefaultAccess() do not return fals anymore if the parent does not exists. They just stop inheritance.
</release>
</notes>
</changelog> </changelog>
</package> </package>