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

chg: [side_menu] Small glitches due to merge

pull/6120/head
mokaddem 2020-09-22 14:42:13 +02:00
parent 6d5395eea6
commit 87e76da1c0
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/View/Elements/genericElements/SideMenu/side_menu.ctp
View File

@ -1181,6 +1181,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
case 'galaxies':
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'galaxy_index',
'url' => $baseurl . '/galaxies/index',
'text' => __('List Galaxies')
));
@ -1192,6 +1193,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
));
}
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'relationship_index',
'url' => $baseurl . '/galaxy_cluster_relations/index',
'text' => __('List Relationships')
));
@ -1296,11 +1298,6 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/galaxies/view/' . h($galaxy['Galaxy']['id']),
'text' => __('View Galaxy')
));
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'view_cluster',
'url' => $baseurl . '/galaxy_clusters/view/' . h($id),
'text' => __('View Cluster')
));
}
break;

2
app/View/Galaxies/index.ctp
View File

@ -84,7 +84,7 @@
)
));
echo '</div>';
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'galaxies', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'galaxies', 'menuItem' => 'index', 'element_id' => 'galaxy_index'));
?>
<script type="text/javascript">
var passedArgsArray = <?php echo $passedArgs; ?>;