CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

fix: [investigation] fix create investigation

pull/594/head
Terrtia 2023-04-20 16:17:54 +02:00
parent 7ed7b4c63e
commit 79fa5dc30b
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/lib/Tag.py
View File

@ -973,8 +973,8 @@ def is_enabled_tag(tag, enabled_namespace=None):
return is_enabled_galaxy_tag(tag, enabled_galaxies=enabled_namespace) return is_enabled_galaxy_tag(tag, enabled_galaxies=enabled_namespace)
def are_enabled_tags(tags): def are_enabled_tags(tags):
enabled_taxonomies = get_active_taxonomies(r_set=True) enabled_taxonomies = get_active_taxonomies()
enabled_galaxies = get_active_galaxies(r_set=True) enabled_galaxies = get_active_galaxies()
for tag in tags: for tag in tags:
if is_taxonomie_tag(tag): if is_taxonomie_tag(tag):
res = is_enabled_taxonomie_tag(tag, enabled_taxonomies=enabled_taxonomies) res = is_enabled_taxonomie_tag(tag, enabled_taxonomies=enabled_taxonomies)

66
var/www/templates/investigations/investigations.html
View File

@ -35,38 +35,42 @@
</h3> </h3>
<table id="table_investigation" class="table table-striped border-primary"> <table id="table_investigation" class="table table-striped border-primary">
<thead class="bg-dark text-white"> <thead class="bg-dark text-white">
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Date</th> <th>Date</th>
<th>last modified</th> <th>last modified</th>
<td>Info</td> <td>Info</td>
<th>Nb Objects</th> <th>Nb Objects</th>
</tr> </tr>
</thead> </thead>
<tbody style="font-size: 15px;"> <tbody style="font-size: 15px;">
{% for dict_investigation in investigations %} {% for dict_investigation in investigations %}
<tr class="border-color: blue;"> <tr class="border-color: blue;">
<td> <td>
<a href="{{ url_for('investigations_b.show_investigation') }}?uuid={{ dict_investigation['uuid'] }}"> <a href="{{ url_for('investigations_b.show_investigation') }}?uuid={{ dict_investigation['uuid'] }}">
{{ dict_investigation['info']}} {{ dict_investigation['info']}}
<div> <div>
{% for tag in dict_investigation['tags'] %} {% for tag in dict_investigation['tags'] %}
<span class="badge badge-{{ bootstrap_label[loop.index0 % 5] }} pull-left">{{ tag }}</span> <span class="badge badge-{{ bootstrap_label[loop.index0 % 5] }} pull-left">{{ tag }}</span>
{% endfor %} {% endfor %}
</div> </div>
</a> </a>
</td> </td>
<td>{{ dict_investigation['date']}}</td> <td>{{ dict_investigation['date']}}</td>
<td>{{ dict_investigation['last_change']}}</td> <td>{{ dict_investigation['last_change']}}</td>
<td>{{ dict_investigation['info']}}</td> <td>{{ dict_investigation['info']}}</td>
<td>{{ dict_investigation['nb_objects']}}</td> <td>{{ dict_investigation['nb_objects']}}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div> <a class="btn btn-primary mt-2" href="{{ url_for('investigations_b.add_investigation') }}">
<i class="fas fa-plus"></i> Create Investigation
</a>
</div>
</div> </div>
</div> </div>