lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: retain index for link #2870

Browse Source 
Spotted by: @adschellevis
This commit is contained in:
Franco Fichtner 2018-11-05 21:29:37 +01:00
parent 8283fd3969
commit 266ff43db5
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/www/system_groupmanager.php
View File

@ -377,13 +377,12 @@ $( document ).ready(function() {
</thead>
<tbody>
<?php
$i = 0;
/* create a copy for sorting */
$a_group_ro = $a_group;
usort($a_group_ro, function($a, $b) {
uasort($a_group_ro, function($a, $b) {
return strnatcasecmp($a['name'], $b['name']);
});
foreach ($a_group_ro as $group): ?>
foreach ($a_group_ro as $i => $group): ?>
<tr>
<td>
<span class="fa fa-user <?= !empty($group['priv']) && in_array('page-all', $group['priv']) ? 'text-danger' : 'text-info' ?>"></span>
@ -396,21 +395,16 @@ $( document ).ready(function() {
class="btn btn-default btn-xs" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
<span class="fa fa-pencil fa-fw"></span>
</a>
<?php
if ($group['scope'] != "system") :?>
<?php if ($group['scope'] != 'system'): ?>
<button type="button" class="btn btn-default btn-xs act-del-group"
data-groupname="<?=$group['name'];?>"
data-groupid="<?=$i?>" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip">
<span class="fa fa-trash fa-fw"></span>
</button>
<?php
endif;?>
<?php endif ?>
</td>
</tr>
<?php
$i++;
endforeach;?>
<?php endforeach ?>
<tr>
<td colspan="4">
<table>

17
src/www/system_usermanager.php
View File

@ -995,12 +995,12 @@ $( document ).ready(function() {
</thead>
<tbody>
<?php
$i = 0;
/* create a copy for sorting */
$a_user_ro = $a_user;
usort($a_user_ro, function($a, $b) {
uasort($a_user_ro, function($a, $b) {
return strnatcasecmp($a['name'], $b['name']);
});
foreach ($a_user_ro as $userent): ?>
foreach ($a_user_ro as $i => $userent): ?>
<tr>
<td>
<?php
@ -1020,21 +1020,16 @@ $( document ).ready(function() {
class="btn btn-default btn-xs" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
<span class="fa fa-pencil fa-fw"></span>
</a>
<?php
if ($userent['scope'] != "system") :?>
<?php if ($userent['scope'] != 'system'): ?>
<button type="button" class="btn btn-default btn-xs act-del-user"
data-username="<?=$userent['name'];?>"
data-userid="<?=$i?>" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip">
<span class="fa fa-trash fa-fw"></span>
</button>
<?php
endif;?>
<?php endif ?>
</td>
</tr>
<?php
$i++;
endforeach;
?>
<?php endforeach ?>
<tr>
<td colspan="3">
<table>