gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-15 17:49: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 2019-04-04 11:41:45 +02:00
commit d8fb4fa4b0
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -144,6 +144,8 @@
via restapi
- add an input field on the substitute user and extension list page for filtering
table rows by string
- do not list users/groups in select menu on DocumentAccess page which already
has an access right
--------------------------------------------------------------------------------
Changes in version 5.1.9

17
views/bootstrap/class.DocumentAccess.php
View File

@ -189,11 +189,16 @@ $(document).ready( function() {
<input type="Hidden" name="documentid" value="<?php print $document->getId()?>">
<input type="Hidden" name="action" value="addaccess">
<?php
$memusers = array();
foreach ($accessList["users"] as $userAccess) {
$userObj = $userAccess->getUser();
$memusers[] = $userObj->getID();
}
$options = array();
$options[] = array(-1, getMLText('select_one'));
foreach ($allUsers as $currUser) {
if (!$currUser->isGuest())
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), ($currUser->getID()==$user->getID()), array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
if (!$currUser->isGuest() && !in_array($currUser->getID(), $memusers))
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), false, array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
}
$this->formField(
getMLText("user"),
@ -204,10 +209,16 @@ $(document).ready( function() {
'options'=>$options
)
);
$memgroups = array();
foreach ($accessList["groups"] as $groupAccess) {
$groupObj = $groupAccess->getGroup();
$memgroups[] = $groupObj->getID();
}
$options = array();
$options[] = array(-1, getMLText('select_one'));
foreach ($allGroups as $groupObj) {
$options[] = array($groupObj->getID(), htmlspecialchars($groupObj->getName()));
if(!in_array($groupObj->getID(), $memgroups))
$options[] = array($groupObj->getID(), htmlspecialchars($groupObj->getName()));
}
$this->formField(
getMLText("group"),