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

fix: Invalid element load while browsing the galaxies, fixes #1752 

- was hard to spot at first, but indeed the bug is as described in the issue and masked by an ajax load of the contents
pull/1786/head
iglocska 2016-12-23 12:53:02 +01:00
parent 07822ffbd6
commit 0e460822dd
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/View/Galaxies/view.ctp
View File

@ -16,13 +16,11 @@
<dd><?php echo h($galaxy['Galaxy']['description']); ?></dd> <dd><?php echo h($galaxy['Galaxy']['description']); ?></dd>
<dt>Version</dt> <dt>Version</dt>
<dd><?php echo h($galaxy['Galaxy']['version']); ?></dd> <dd><?php echo h($galaxy['Galaxy']['version']); ?></dd>
</dl> </dl>
</div> </div>
</div> </div>
<div id="clusters_div"> <div id="clusters_div"></div>
<?php echo $this->element('galaxyclusters'); ?>
</div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {

8
app/View/GalaxyClusters/view.ctp
View File

@ -31,13 +31,13 @@
</dd> </dd>
<dt>Events</dt> <dt>Events</dt>
<dd> <dd>
<?php <?php
if (isset($cluster['GalaxyCluster']['tag_count'])): if (isset($cluster['GalaxyCluster']['tag_count'])):
?> ?>
<a href="<?php echo $baseurl; ?>/events/index/searchtag:<?php echo h($cluster['GalaxyCluster']['tag_id']); ?>"><?php echo h($cluster['GalaxyCluster']['tag_count']); ?> event(s)</a> <a href="<?php echo $baseurl; ?>/events/index/searchtag:<?php echo h($cluster['GalaxyCluster']['tag_id']); ?>"><?php echo h($cluster['GalaxyCluster']['tag_count']); ?> event(s)</a>
<?php <?php
else: else:
echo '0'; echo '0';
endif; endif;
?> ?>
</dd> </dd>
@ -45,9 +45,7 @@
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div id="elements_div" class="span8"> <div id="elements_div" class="span8"></div>
<?php echo $this->element('galaxyelements'); ?>
</div>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">