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

RBAC 

name all Role i.s.o. Group.
pull/63/head
noud 2012-10-31 17:10:59 +01:00
parent 49a21bf6a5
commit 60910ae5db
11 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/View/Elements/actions_menu.ctp
View File

@ -26,8 +26,8 @@
<li>&nbsp;</li>
<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true)); ?> </li>
<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true)); ?> </li>
<li><?php echo $this->Html->link(__('New Group', true), array('controller' => 'groups', 'action' => 'add', 'admin' => true)); ?> </li>
<li><?php echo $this->Html->link(__('List Groups', true), array('controller' => 'groups', 'action' => 'index', 'admin' => true)); ?> </li>
<li><?php echo $this->Html->link(__('New Role', true), array('controller' => 'groups', 'action' => 'add', 'admin' => true)); ?> </li>
<li><?php echo $this->Html->link(__('List Roles', true), array('controller' => 'groups', 'action' => 'index', 'admin' => true)); ?> </li>
<li>&nbsp;</li>
<h3><?php echo __('Audit'); ?></h3>
<li><?php echo $this->Html->link(__('List Logs', true), array('controller' => 'logs', 'action' => 'index', 'admin' => true)); ?> </li>

16
app/View/Groups/admin_add.ctp
View File

@ -1,15 +1,19 @@
<div class="groups form">
<?php echo $this->Form->create('Group');?>
<fieldset>
<legend><?php echo __('Admin Add Group'); ?></legend>
<legend><?php echo __('Admin Add Role'); ?></legend>
<?php
echo $this->Form->input('name');
echo $this->Form->input('perm_add');
echo $this->Form->input('perm_modify');
echo $this->Form->input('perm_publish');
echo $this->Form->input('perm_full');
echo $this->Form->input('name');?>
<fieldset>
<legend><?php echo __('Permission'); ?></legend>
<?php
echo $this->Form->input('perm_add', array('label' => 'add'));
echo $this->Form->input('perm_modify', array('label' => 'modify'));
echo $this->Form->input('perm_publish', array('label' => 'publish'));
echo $this->Form->input('perm_full', array('label' => 'full'));
?>
</fieldset>
</fieldset>
<?php echo $this->Form->end(__('Submit'));?>
</div>
<div class="actions">

10
app/View/Groups/admin_edit.ctp
View File

@ -1,16 +1,16 @@
<div class="groups form">
<?php echo $this->Form->create('Group');?>
<fieldset>
<legend><?php echo __('Admin Edit Group'); ?></legend>
<legend><?php echo __('Admin Edit Role'); ?></legend>
<?php
echo $this->Form->input('name');?>
<fieldset>
<legend><?php echo __('Permission'); ?></legend>
<?php
echo $this->Form->input('perm_add', array( 'label' => 'add'));
echo $this->Form->input('perm_modify', array( 'label' => 'modify'));
echo $this->Form->input('perm_publish', array( 'label' => 'publish'));
echo $this->Form->input('perm_full', array( 'label' => 'full'));
echo $this->Form->input('perm_add', array('label' => 'add'));
echo $this->Form->input('perm_modify', array('label' => 'modify'));
echo $this->Form->input('perm_publish', array('label' => 'publish'));
echo $this->Form->input('perm_full', array('label' => 'full'));
?>
</fieldset>
</fieldset>

2
app/View/Groups/admin_index.ctp
View File

@ -1,5 +1,5 @@
<div class="groups index">
<h2><?php echo __('Groups');?></h2>
<h2><?php echo __('Roles');?></h2>
<table cellpadding="0" cellspacing="0">
<tr>
<th><?php echo $this->Paginator->sort('id');?></th>

2
app/View/Groups/admin_view.ctp
View File

@ -2,7 +2,7 @@
<!--div class="actions" style="float:right;">
<ul><li><?php echo $this->Html->link(__('Edit Profile', true), array('admin' => true, 'action' => 'edit', $group['Group']['id'])); ?> </li></ul>
</div-->
<h2><?php echo __('Group');?></h2>
<h2><?php echo __('Role');?></h2>
<dl>
<dt><?php echo __('Id'); ?></dt>
<dd>

2
app/View/Groups/view.ctp
View File

@ -1,5 +1,5 @@
<div class="groups view">
<h2><?php echo __('Group');?></h2>
<h2><?php echo __('Role');?></h2>
<dl>
<dt><?php echo __('Id'); ?></dt>
<dd>

2
app/View/Users/admin_add.ctp
View File

@ -7,7 +7,7 @@
echo $this->Form->input('password');
echo $this->Form->input('confirm_password', array('type' => 'password', 'div' => array('class' => 'input password required')));
echo $this->Form->input('org');
echo $this->Form->input('group_id');
echo $this->Form->input('group_id', array('label' => 'Role'));
echo $this->Form->input('autoalert');
echo $this->Form->input('authkey', array('value' => $authkey));
echo $this->Form->input('nids_sid');

2
app/View/Users/admin_edit.ctp
View File

@ -7,7 +7,7 @@
echo $this->Form->input('password');
echo $this->Form->input('confirm_password', array('type' => 'password', 'div' => array('class' => 'input password required')));
echo $this->Form->input('org');
echo $this->Form->input('group_id'); // TODO ACL, User edit group_id.
echo $this->Form->input('group_id', array('label' => 'Role')); // TODO ACL, User edit group_id.
echo $this->Form->input('autoalert');
echo $this->Form->input('authkey');
echo $this->Form->input('nids_sid');

2
app/View/Users/admin_index.ctp
View File

@ -9,7 +9,7 @@ $buttonPublishStatus = $isAclPublish ? 'button_on':'button_off';
<tr>
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo $this->Paginator->sort('org');?></th>
<th><?php echo $this->Paginator->sort('group_id');?></th>
<th><?php echo $this->Paginator->sort('group_id', 'Role');?></th>
<th><?php echo $this->Paginator->sort('email');?></th>
<th><?php echo $this->Paginator->sort('autoalert');?></th>
<th><?php echo $this->Paginator->sort('gpgkey');?></th>

2
app/View/Users/admin_view.ctp
View File

@ -24,7 +24,7 @@ $buttonModifyStatus = $mayModify ? 'button_on':'button_off';
<?php echo h($user['User']['org']); ?>
&nbsp;
</dd>
<dt><?php echo __('Group'); ?></dt>
<dt><?php echo __('Role'); ?></dt>
<dd>
<?php echo $this->Html->link($user['Group']['name'], array('controller' => 'groups', 'action' => 'view', $user['Group']['id'])); ?>
&nbsp;

2
app/View/Users/view.ctp
View File

@ -19,7 +19,7 @@
<?php echo h($user['User']['org']); ?>
&nbsp;
</dd>
<dt><?php echo __('Group'); ?></dt>
<dt><?php echo __('Role'); ?></dt>
<dd>
<?php echo h($user['Group']['name']); ?> <!-- TODO ACL, check, My Profile not edit group_id. -->
&nbsp;