MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Small changes after merging the two feature branches 

- Update to the representation of the new permission flags

- some small issues with the merge resolved
pull/217/head
iglocska 2013-10-25 11:31:35 +02:00
parent 226db074e6
commit 0591db2a67
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/UsersController.php
View File

@ -323,6 +323,7 @@ class UsersController extends AppController {
$this->request->data = $this->User->data; // TODO CHECK
}
$this->set('id', $id);
$this->set(compact('roles'));
}

8
app/View/Roles/admin_index.ctp
View File

@ -22,9 +22,11 @@
<th><?php echo $this->Paginator->sort('name');?></th>
<th><?php echo $this->Paginator->sort('permission', 'Permission');?></th>
<th><?php echo $this->Paginator->sort('perm_sync', 'Sync Actions');?></th>
<th><?php echo $this->Paginator->sort('perm_admin', 'Administration Actions');?></th>
<th><?php echo $this->Paginator->sort('perm_audit', 'Audit Actions');?></th>
<th><?php echo $this->Paginator->sort('perm_regexp', 'Regexp Actions');?></th>
<th><?php echo $this->Paginator->sort('perm_auth', 'Auth Key Access');?></th>
<th><?php echo $this->Paginator->sort('perm_admin', 'Admin');?></th>
<th><?php echo $this->Paginator->sort('perm_site_admin', 'Site Admin');?></th>
<th class="actions"><?php echo __('Actions');?></th>
</tr><?php
foreach ($list as $item): ?>
@ -33,9 +35,11 @@ foreach ($list as $item): ?>
<td><?php echo h($item['Role']['name']); ?>&nbsp;</td>
<td class="short"><?php echo h($options[$item['Role']['permission']]); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_sync']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_admin']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_audit']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_regexp_access']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_auth']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_admin']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_site_admin']); ?>&nbsp;</td>
<td class="short action-links">
<?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Role']['id']), array('class' => 'icon-edit', 'title' => 'Edit')); ?>
<?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Role']['id']), array('class' => 'icon-trash', 'title' => 'Delete'), __('Are you sure you want to delete %s?', $item['Role']['name'])); ?>

8
app/View/Roles/index.ctp
View File

@ -22,9 +22,11 @@
<th><?php echo $this->Paginator->sort('name');?></th>
<th><?php echo $this->Paginator->sort('permission', 'Permission');?></th>
<th><?php echo $this->Paginator->sort('perm_sync', 'Sync Actions');?></th>
<th><?php echo $this->Paginator->sort('perm_admin', 'Administration Actions');?></th>
<th><?php echo $this->Paginator->sort('perm_audit', 'Audit Actions');?></th>
<th><?php echo $this->Paginator->sort('perm_regexp', 'Regexp Actions');?></th>
<th><?php echo $this->Paginator->sort('perm_auth', 'Auth Key Access');?></th>
<th><?php echo $this->Paginator->sort('perm_admin', 'Administration Actions');?></th>
<th><?php echo $this->Paginator->sort('perm_site_admin', 'Site Admin');?></th>
</tr><?php
foreach ($list as $item): ?>
<tr>
@ -32,9 +34,11 @@ foreach ($list as $item): ?>
<td><?php echo h($item['Role']['name']); ?>&nbsp;</td>
<td class="short"><?php echo h($options[$item['Role']['permission']]); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_sync']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_admin']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_audit']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_regexp_access']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_auth']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_admin']); ?>&nbsp;</td>
<td class="short"><?php echo h($item['Role']['perm_site_admin']); ?>&nbsp;</td>
</tr><?php
endforeach; ?>
</table>

20
app/View/Roles/view.ctp
View File

@ -26,16 +26,26 @@
<?php echo h($role['Role']['perm_publish']); ?>
&nbsp;
</dd>
<dt><?php echo __('Full'); ?></dt>
<dd>
<?php echo h($role['Role']['perm_full']); ?>
&nbsp;
</dd>
<dt><?php echo __('Auth'); ?></dt>
<dd>
<?php echo h($role['Role']['perm_auth']); ?>
&nbsp;
</dd>
<dt><?php echo __('Regexp'); ?></dt>
<dd>
<?php echo h($role['Role']['perm_regexp_access']); ?>
&nbsp;
</dd>
<dt><?php echo __('Admin'); ?></dt>
<dd>
<?php echo h($role['Role']['perm_admin']); ?>
&nbsp;
</dd>
<dt><?php echo __('Site Admin'); ?></dt>
<dd>
<?php echo h($role['Role']['perm_site_admin']); ?>
&nbsp;
</dd>
</dl>
</div>
<?php