mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-06-01 22:47:19 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
73fe0e37ff
|
@ -465,9 +465,13 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
|
|||
*/
|
||||
function getDefaultAccess() { /* {{{ */
|
||||
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();
|
||||
if (!$res) return false;
|
||||
return $this->_parent->getDefaultAccess();
|
||||
if ($res)
|
||||
return $this->_parent->getDefaultAccess();
|
||||
}
|
||||
|
||||
return $this->_defaultAccess;
|
||||
|
@ -1227,10 +1231,15 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
|
|||
$db = $this->_dms->getDB();
|
||||
|
||||
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();
|
||||
if (!$res) return false;
|
||||
$pacl = $res->getAccessList($mode, $op);
|
||||
return $pacl;
|
||||
if ($res) {
|
||||
$pacl = $res->getAccessList($mode, $op);
|
||||
return $pacl;
|
||||
}
|
||||
} else {
|
||||
$pacl = array("groups" => array(), "users" => array());
|
||||
}
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
<date>2020-09-29</date>
|
||||
<time>13:44:55</time>
|
||||
<version>
|
||||
<release>6.0.13</release>
|
||||
<api>6.0.13</api>
|
||||
<release>6.0.14</release>
|
||||
<api>6.0.14</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
|
@ -24,7 +24,6 @@
|
|||
</stability>
|
||||
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
|
||||
<notes>
|
||||
See release 5.1.20
|
||||
</notes>
|
||||
<contents>
|
||||
<dir baseinstalldir="SeedDMS" name="/">
|
||||
|
@ -2090,5 +2089,21 @@ SeedDMS_Core_DMS::filterAccess() properly checks for documents
|
|||
<notes>
|
||||
</notes>
|
||||
</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>
|
||||
</package>
|
||||
|
|
Loading…
Reference in New Issue
Block a user