gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-07 13:49:23 +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-05-20 06:26:07 +02:00
commit fd668ce709
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -160,6 +160,7 @@
- use standard output for document rows on MyDocuments page - use standard output for document rows on MyDocuments page
- new seeddms logo - new seeddms logo
- fix moving clipboard (Closes: #473) - fix moving clipboard (Closes: #473)
- show access rights of folder/document if user has write access
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.16 Changes in version 5.1.16

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

@ -242,7 +242,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
</tr> </tr>
<?php <?php
} }
if($user->isAdmin()) { if($user->isAdmin() || $document->getAccessMode($user) > M_READ) {
echo "<tr>"; echo "<tr>";
echo "<td>".getMLText('default_access').":</td>"; echo "<td>".getMLText('default_access').":</td>";
echo "<td>".$this->getAccessModeText($document->getDefaultAccess())."</td>"; echo "<td>".$this->getAccessModeText($document->getDefaultAccess())."</td>";

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

@ -262,7 +262,7 @@ $('body').on('click', '.order-btn', function(ev) {
echo "</tr>"; echo "</tr>";
} }
if($user->isAdmin()) { if($user->isAdmin() || $folder->getAccessMode($user) > M_READ) {
echo "<tr>"; echo "<tr>";
echo "<td>".getMLText('default_access').":</td>"; echo "<td>".getMLText('default_access').":</td>";
echo "<td>".$this->getAccessModeText($folder->getDefaultAccess())."</td>"; echo "<td>".$this->getAccessModeText($folder->getDefaultAccess())."</td>";