mirror of https://github.com/MISP/MISP
Merge branch 'threads_refactor' into develop
iglocska
commit
12e75b1e04
|
|
@ -41,6 +41,7 @@ class Post extends AppModel
|
|||
'status' => 0,
|
||||
'retries' => 0,
|
||||
'org_id' => $user['User']['org_id'],
|
||||
'org' => $user['Organisation']['name'],
|
||||
'message' => 'Sending...',
|
||||
);
|
||||
$job->save($data);
|
||||
|
|
|
|||
|
|
@ -1,99 +1,60 @@
|
|||
<div class="threads index">
|
||||
<h2><?php echo __('Discussions');?></h2>
|
||||
<div class="pagination">
|
||||
<ul>
|
||||
<?php
|
||||
echo $this->Paginator->prev('« ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
|
||||
echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
|
||||
echo $this->Paginator->next(__('next') . ' »', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<table class="table table-striped table-hover table-condensed">
|
||||
<tr>
|
||||
<th><?php echo $this->Paginator->sort('org');?></th>
|
||||
<th><?php echo __('Title');?></th>
|
||||
<th><?php echo $this->Paginator->sort('date_modified', __('Last Post On'));?></th>
|
||||
<th><?php echo __('Last Post By');?></th>
|
||||
<th><?php echo $this->Paginator->sort('date_created', __('Thread started On'));?></th>
|
||||
<th><?php echo __('Posts');?></th>
|
||||
<th><?php echo __('Distribution');?></th>
|
||||
<th><?php echo __('Actions');?></th>
|
||||
</tr>
|
||||
<?php
|
||||
foreach ($threads as $thread):
|
||||
$lastPost = end($thread['Post']);
|
||||
?>
|
||||
|
||||
<tr>
|
||||
<td class="short" style="text-align: left;" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
|
||||
<?php
|
||||
$imgRelativePath = 'orgs' . DS . h($thread['Organisation']['name']) . '.png';
|
||||
$imgAbsolutePath = APP . WEBROOT_DIR . DS . 'img' . DS . $imgRelativePath;
|
||||
if (file_exists($imgAbsolutePath)) echo $this->Html->image('orgs/' . h($thread['Organisation']['name']) . '.png', array('alt' => h($thread['Organisation']['name']), 'title' => h($thread['Organisation']['name']), 'style' => 'width:24px; height:24px'));
|
||||
else echo $this->Html->tag('span', h($thread['Organisation']['name']), array('class' => 'welcome', 'style' => 'float:left;'));
|
||||
?>
|
||||
|
||||
</td>
|
||||
<td ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
|
||||
<?php
|
||||
echo h($thread['Thread']['title']);
|
||||
?>
|
||||
</td>
|
||||
<td class="short" style="text-align: center;" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
|
||||
<?php
|
||||
echo h($thread['Thread']['date_modified']);
|
||||
?>
|
||||
|
||||
</td>
|
||||
<td class="short" style="text-align: center;" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
|
||||
<?php
|
||||
echo isset($lastPost['User']['email']) ? h($lastPost['User']['email']) : '';
|
||||
?>
|
||||
|
||||
</td>
|
||||
<td class="short" style="text-align: center;" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
|
||||
<?php
|
||||
echo h($thread['Thread']['date_created']);
|
||||
?>
|
||||
</td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
|
||||
<?php
|
||||
echo h($thread['Thread']['post_count']);
|
||||
?>
|
||||
</td>
|
||||
<td class="short" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
|
||||
<?php
|
||||
if ($thread['Thread']['distribution'] < 4) echo $distributionLevels[$thread['Thread']['distribution']];
|
||||
else echo '<a href="' . $baseurl . '/sharing_groups/view/' . h($thread['Thread']['sharing_group_id']) . '" title="' . h($thread['SharingGroup']['name']) . '">Sharing group</a>';
|
||||
?>
|
||||
</td>
|
||||
<td class="short action-links">
|
||||
<?php
|
||||
echo $this->Html->link('', array('action' => 'view', $thread['Thread']['id']), array('class' => 'fa fa-eye', 'title' => __('View Discussion')));
|
||||
?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
endforeach; ?>
|
||||
</table>
|
||||
<p>
|
||||
<?php
|
||||
echo $this->Paginator->counter(array(
|
||||
'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}')
|
||||
echo $this->element('/genericElements/IndexTable/index_table', array(
|
||||
'data' => array(
|
||||
'data' => $threads,
|
||||
'title' => __('Discussions'),
|
||||
'primary_id_path' => 'Thread.id',
|
||||
'fields' => array(
|
||||
array(
|
||||
'name' => __('Org'),
|
||||
'sort' => 'Organisation.name',
|
||||
'data_path' => 'Organisation',
|
||||
'element' => 'org'
|
||||
),
|
||||
array(
|
||||
'name' => __('Title'),
|
||||
'sort' => 'Thread.title',
|
||||
'data_path' => 'Thread.title',
|
||||
),
|
||||
array(
|
||||
'name' => __('Last Post On'),
|
||||
'sort' => 'Thread.date_modified',
|
||||
'data_path' => 'Thread.date_modified',
|
||||
),
|
||||
array(
|
||||
'name' => __('Last Post By'),
|
||||
'sort' => 'User.email',
|
||||
'data_path' => 'User.email',
|
||||
),
|
||||
array(
|
||||
'name' => __('Thread Started On'),
|
||||
'sort' => 'Thread.date_created',
|
||||
'data_path' => 'Thread.date_created',
|
||||
),
|
||||
array(
|
||||
'name' => __('Posts'),
|
||||
'sort' => 'Thread.post_count',
|
||||
'data_path' => 'Thread.post_count',
|
||||
),
|
||||
array(
|
||||
'name' => __('Distribution'),
|
||||
'sort' => 'Thread.distribution',
|
||||
'data_path' => 'Thread.distribution',
|
||||
'element' => 'distribution_levels'
|
||||
),
|
||||
),
|
||||
'actions' => array(
|
||||
array(
|
||||
'url' => $baseurl . '/threads/view',
|
||||
'url_params_data_paths' => array(
|
||||
'Thread.id'
|
||||
),
|
||||
'icon' => 'eye'
|
||||
)
|
||||
)
|
||||
)
|
||||
));
|
||||
?>
|
||||
</p>
|
||||
<div class="pagination">
|
||||
<ul>
|
||||
<?php
|
||||
echo $this->Paginator->prev('« ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
|
||||
echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
|
||||
echo $this->Paginator->next(__('next') . ' »', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<?php
|
||||
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'threads', 'menuItem' => 'index'));
|
||||
<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'threads', 'menuItem' => 'index')); ?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue