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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/1857/head
Alexandre Dulaunoy 2017-01-09 17:21:26 +01:00
parent 667f8cfd46 2b187d48fc
commit a12acdde6a
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/AppController.php
View File

@ -47,6 +47,7 @@ class AppController extends Controller {
public $helpers = array('Utility');
private $__jsVersion = '2.4.58';
public $pyMispVersion = '2.4.56';
public $phpmin = '5.5.9';
public $phprec = '5.6.0';

1
app/Controller/Component/ACLComponent.php
View File

@ -235,6 +235,7 @@ class ACLComponent extends Component {
'edit' => array(),
'fetchServersForSG' => array('*'),
'filterEventIndex' => array(),
'getPyMISPVersion' => array('*'),
'getVersion' => array('*'),
'index' => array('OR' => array('perm_sync', 'perm_admin')),
'previewEvent' => array(),

5
app/Controller/ServersController.php
View File

@ -1155,4 +1155,9 @@ class ServersController extends AppController {
$this->set('response', array('version' => $versionArray['major'] . '.' . $versionArray['minor'] . '.' . $versionArray['hotfix'], 'perm_sync' => $this->userRole['perm_sync']));
$this->set('_serialize', 'response');
}
public function getPyMISPVersion() {
$this->set('response', array('version' => $this->pyMispVersion));
$this->set('_serialize', 'response');
}
}

1
app/webroot/js/misp2.4.58.js
View File

@ -2729,7 +2729,6 @@ function checkAndSetPublishedInfo() {
$('.published').removeClass('hidden');
$('.not-published').addClass('hidden');
} else {
alert(1);
$('.published').addClass('hidden');
$('.not-published').removeClass('hidden');
}