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

Merge pull request #6720 from JakubOnderka/permission-ui 

Permission UI
pull/6724/head
Jakub Onderka 2020-12-09 18:16:33 +01:00 committed by GitHub
parent c8f7bb4a72 d6bf3710ba
commit fbeb4aee2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controller/TaxonomiesController.php
View File

@ -1,6 +1,9 @@
<?php
App::uses('AppController', 'Controller');
/**
* @property Taxonomy $Taxonomy
*/
class TaxonomiesController extends AppController
{
public $components = array('Session', 'RequestHandler');
@ -410,7 +413,7 @@ class TaxonomiesController extends AppController
if ($this->request->is('post')) {
$result = $this->Taxonomy->delete($id, true);
if ($result) {
$this->Flash->success(__('Taxonomy successfuly deleted.'));
$this->Flash->success(__('Taxonomy successfully deleted.'));
$this->redirect(array('controller' => 'taxonomies', 'action' => 'index'));
} else {
$this->Flash->error(__('Taxonomy could not be deleted.'));

20
app/View/Elements/genericElements/SideMenu/side_menu.ctp
View File

@ -161,7 +161,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'text' => __('Merge attributes from…')
));
}
if (($isSiteAdmin && (!isset($mayModify) || !$mayModify)) || (!isset($mayModify) || !$mayModify)) {
if ($canAccess('shadowAttributes', 'add') && (($isSiteAdmin && (!isset($mayModify) || !$mayModify)) || (!isset($mayModify) || !$mayModify))) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'proposeAttribute',
'url' => $baseurl . '/shadow_attributes/add/' . $eventId,
@ -1087,14 +1087,16 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'element_id' => 'view',
'text' => __('View Taxonomy')
));
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'delete',
'onClick' => array(
'function' => 'deleteObject',
'params' => array('taxonomies', 'delete', h($id), h($id))
),
'text' => __('Delete Taxonomy')
));
if ($canAccess('taxonomies', 'delete')) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'delete',
'onClick' => array(
'function' => 'deleteObject',
'params' => array('taxonomies', 'delete', h($id), h($id))
),
'text' => __('Delete Taxonomy')
));
}
}
if ($isSiteAdmin) {
echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(

3
app/View/Elements/global_menu.ctp
View File

@ -35,7 +35,8 @@
),
array(
'text' => __('REST client'),
'url' => $baseurl . '/servers/rest'
'url' => $baseurl . '/servers/rest',
'requirement' => $canAccess('servers', 'rest'),
),
array(
'type' => 'separator'

4
app/View/Events/view.ctp
View File

@ -25,11 +25,11 @@
'key' => 'UUID',
'html' => sprintf('<span class="quickSelect">%s</span> %s',
$event['Event']['uuid'],
sprintf('<a href="%s/events/add/extends:%s" class="btn btn-inverse noPrint" style="line-height: 10px; padding: 4px 4px; margin-left: 0.3em" title="%s">+</a>',
$isAclAdd ? sprintf('<a href="%s/events/add/extends:%s" class="btn btn-inverse noPrint" style="line-height: 10px; padding: 4px 4px; margin-left: 0.3em" title="%s">+</a>',
$baseurl,
$event['Event']['id'],
__('Extend this event')
)
) : ''
)
);
if (Configure::read('MISP.showorgalternate')) {