gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-05-02 17:18:16 +02:00
commit d3913318f5
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -90,6 +90,7 @@
- fix authentication in webdav.php (Closes #250)
- update last access time only once a minute
- run action 'css' in view if it exists, move css code for timeline
- show role of users in user list and substitute user list
--------------------------------------------------------------------------------
Changes in version 4.3.34

15
views/bootstrap/class.SubstituteUser.php
View File

@ -49,7 +49,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
?>
<table class="table table-condensed">
<thead>
<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('groups'); ?></th><th></th></tr>
<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('role'); ?></th><th></th></tr>
</thead>
<tbody>
<?php
@ -73,6 +73,19 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
}
echo "</td>";
echo "<td>";
switch($currUser->getRole()) {
case SeedDMS_Core_User::role_user:
printMLText("role_user");
break;
case SeedDMS_Core_User::role_admin:
printMLText("role_admin");
break;
case SeedDMS_Core_User::role_guest:
printMLText("role_guest");
break;
}
echo "</td>";
echo "<td>";
if($currUser->getID() != $user->getID()) {
echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
}

15
views/bootstrap/class.UserList.php
View File

@ -50,7 +50,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
?>
<table class="table table-condensed">
<thead><tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr></thead><tbody>
<thead><tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('role'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr></thead><tbody>
<?php
foreach ($allUsers as $currUser) {
echo "<tr>";
@ -74,6 +74,19 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
}
echo "</td>";
echo "<td>";
switch($currUser->getRole()) {
case SeedDMS_Core_User::role_user:
printMLText("role_user");
break;
case SeedDMS_Core_User::role_admin:
printMLText("role_admin");
break;
case SeedDMS_Core_User::role_guest:
printMLText("role_guest");
break;
}
echo "</td>";
echo "<td>";
echo SeedDMS_Core_File::format_filesize($currUser->getUsedDiskSpace());
if($quota) {
echo " / ";