mirror of https://github.com/MISP/MISP
commit
fbeb4aee2c
|
@ -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.'));
|
||||
|
|
|
@ -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,6 +1087,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
|
|||
'element_id' => 'view',
|
||||
'text' => __('View Taxonomy')
|
||||
));
|
||||
if ($canAccess('taxonomies', 'delete')) {
|
||||
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
|
||||
'element_id' => 'delete',
|
||||
'onClick' => array(
|
||||
|
@ -1096,6 +1097,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
|
|||
'text' => __('Delete Taxonomy')
|
||||
));
|
||||
}
|
||||
}
|
||||
if ($isSiteAdmin) {
|
||||
echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
|
||||
'event_id' => 'update',
|
||||
|
|
|
@ -35,7 +35,8 @@
|
|||
),
|
||||
array(
|
||||
'text' => __('REST client'),
|
||||
'url' => $baseurl . '/servers/rest'
|
||||
'url' => $baseurl . '/servers/rest',
|
||||
'requirement' => $canAccess('servers', 'rest'),
|
||||
),
|
||||
array(
|
||||
'type' => 'separator'
|
||||
|
|
|
@ -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')) {
|
||||
|
|
Loading…
Reference in New Issue