tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

GroupController: Just show a group's name when listing groups

Browse Source 
refs #8826
This commit is contained in:
Johannes Meyer 2015-05-20 15:54:47 +02:00
parent 2cec4a6d67
commit 94cd4b91e5
3 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/controllers/GroupController.php
View File

@ -64,13 +64,7 @@ class GroupController extends Controller
return; return;
} }
$query = $backend->select(array( $query = $backend->select(array('group_name'));
'group_name',
'parent_name',
'created_at',
'last_modified'
));
$filterEditor = Widget::create('filterEditor') $filterEditor = Widget::create('filterEditor')
->setQuery($query) ->setQuery($query)
->preserveParams('limit', 'sort', 'dir', 'view', 'backend') ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')

12
application/views/scripts/group/list.phtml
View File

@ -36,9 +36,6 @@ if (count($groups) > 0): ?>
<thead> <thead>
<tr> <tr>
<th class="group-name"><?= $this->translate('Group'); ?></th> <th class="group-name"><?= $this->translate('Group'); ?></th>
<th class="group-parent"><?= $this->translate('Parent'); ?></th>
<th class="group-created"><?= $this->translate('Created at'); ?></th>
<th class="group-modified"><?= $this->translate('Last modified'); ?></th>
<?php if ($reducible): ?> <?php if ($reducible): ?>
<th class="group-remove"><?= $this->translate('Remove'); ?></th> <th class="group-remove"><?= $this->translate('Remove'); ?></th>
<?php endif ?> <?php endif ?>
@ -48,15 +45,6 @@ if (count($groups) > 0): ?>
<?php foreach ($groups as $group): ?> <?php foreach ($groups as $group): ?>
<tr> <tr>
<td clas="group-name"><?= $this->escape($group->group_name); ?></td> <td clas="group-name"><?= $this->escape($group->group_name); ?></td>
<td class="group-parent">
<?= $group->parent_name === null ? $this->translate('None', 'user.group.parent') : $this->escape($group->parent_name); ?>
</td>
<td class="group-created">
<?= $group->created_at === null ? $this->translate('N/A') : date('d/m/Y g:i A', $group->created_at); ?>
</td>
<td class="group-modified">
<?= $group->last_modified === null ? $this->translate('Never') : date('d/m/Y g:i A', $group->last_modified); ?>
</td>
<?php if ($reducible): ?> <?php if ($reducible): ?>
<td class="group-remove"> <td class="group-remove">
<?= $this->qlink( <?= $this->qlink(

19
public/css/icinga/main-content.less
View File

@ -243,21 +243,13 @@ div.controls div.user-header {
div.content.groups { div.content.groups {
table.group-list { table.group-list {
th { th.group-remove {
&.group-parent, &.group-remove { width: 8em;
width: 6%;
padding-right: 0.5em; padding-right: 0.5em;
text-align: right; text-align: right;
} }
&.group-created, &.group-modified { td.group-remove {
width: 12%;
padding-right: 0.5em;
text-align: right;
}
}
td.group-parent, td.group-created, td.group-modified, td.group-remove {
text-align: right; text-align: right;
} }
} }
@ -265,6 +257,11 @@ div.content.groups {
p { p {
margin-top: 0; margin-top: 0;
} }
a.group-add {
display: block;
margin-top: 1em;
}
} }
form.backend-selection { form.backend-selection {