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

Changes to the tagging 

- tags can now be set correctly for all events
- some UI changes to the tags
- moved the deletion of all event_tags when a tag gets deleted to beforefilter
pull/224/head
iglocska 2014-02-20 10:07:51 +01:00
parent 914687142e
commit 4279ca5130
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/EventsController.php
View File

@ -2056,9 +2056,9 @@ class EventsController extends AppController {
$tag_id = $this->request->data['Event']['tag'];
$id = $this->request->data['Event']['id'];
$this->Event->recurisve = -1;
$event = $this->Event->read(array('id', 'org', 'orgc'), $id);
$event = $this->Event->read(array('id', 'org', 'orgc', 'distribution'), $id);
// org should allow to tag too, so that an event that gets pushed can be tagged locally by the owning org
if ($this->Auth->user('org') !== $event['Event']['org'] && $this->Auth->user('org') !== $event['Event']['orgc'] && !$this->_isSiteAdmin()) {
if (($this->Auth->user('org') !== $event['Event']['org'] && $this->Auth->user('org') !== $event['Event']['orgc'] && $event['Event']['distribution'] == 0) || (!$this->userRole['perm_tagger']) && !$this->_isSiteAdmin()) {
throw new MethodNotAllowedException('You don\'t have permission to do that.');
}
$this->Event->EventTag->Tag->id = $tag_id;
@ -2087,9 +2087,9 @@ class EventsController extends AppController {
throw new MethodNotAllowedException('You don\'t have permission to do that.');
}
$this->Event->recurisve = -1;
$event = $this->Event->read(array('id', 'org', 'orgc'), $id);
$event = $this->Event->read(array('id', 'org', 'orgc', 'distribution'), $id);
// org should allow to tag too, so that an event that gets pushed can be tagged locally by the owning org
if ($this->Auth->user('org') !== $event['Event']['org'] && $this->Auth->user('org') !== $event['Event']['orgc'] && !$this->_isSiteAdmin()) {
if (($this->Auth->user('org') !== $event['Event']['org'] && $this->Auth->user('org') !== $event['Event']['orgc'] && $event['Event']['distribution'] == 0) || (!$this->userRole['perm_tagger']) && !$this->_isSiteAdmin()) {
throw new MethodNotAllowedException('You don\'t have permission to do that.');
}
$eventTag = $this->Event->EventTag->find('first', array(

1
app/Controller/TagsController.php
View File

@ -74,7 +74,6 @@ class TagsController extends AppController {
throw new NotFoundException('Invalid tag');
}
if ($this->Tag->delete()) {
$this->Tag->EventTag->deleteAll(array('EventTag.tag_id' => $id));
$this->Session->setFlash(__('Attribute deleted'));
} else {
$this->Session->setFlash(__('Attribute was not deleted'));

6
app/Model/Tag.php
View File

@ -58,6 +58,12 @@ class Tag extends AppModel {
'className' => 'EventTag',
)
);
public function beforeDelete($cascade = true) {
$this->EventTag->deleteAll(array('EventTag.tag_id' => $this->id));
}
public function validateColour($fields) {
if (!preg_match('/^#[0-9a-f]{6}$/i', $fields['colour'])) return false;
return true;

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

@ -108,7 +108,8 @@ $mayPublish = ($isAclPublish && $event['Event']['orgc'] == $me['org']);
<button id="addTagButton" class="btn btn-inverse" style="line-height:10px; padding: 4px 4px;">+</button>
</td>
<?php else: echo '&nbsp;';
<?php else:
if (empty($tags)) echo '&nbsp;';
endif; ?>
</tr>
</table>