diff --git a/bin/lib/Tag.py b/bin/lib/Tag.py index 568231f6..215d28d2 100755 --- a/bin/lib/Tag.py +++ b/bin/lib/Tag.py @@ -973,8 +973,8 @@ def is_enabled_tag(tag, enabled_namespace=None): return is_enabled_galaxy_tag(tag, enabled_galaxies=enabled_namespace) def are_enabled_tags(tags): - enabled_taxonomies = get_active_taxonomies(r_set=True) - enabled_galaxies = get_active_galaxies(r_set=True) + enabled_taxonomies = get_active_taxonomies() + enabled_galaxies = get_active_galaxies() for tag in tags: if is_taxonomie_tag(tag): res = is_enabled_taxonomie_tag(tag, enabled_taxonomies=enabled_taxonomies) diff --git a/var/www/templates/investigations/investigations.html b/var/www/templates/investigations/investigations.html index b4e85b55..fc23891f 100644 --- a/var/www/templates/investigations/investigations.html +++ b/var/www/templates/investigations/investigations.html @@ -35,38 +35,42 @@ - - - - - - - - - - - {% for dict_investigation in investigations %} - - - - - - - - {% endfor %} - -
NameDatelast modifiedInfoNb Objects
- - {{ dict_investigation['info']}} -
- {% for tag in dict_investigation['tags'] %} - {{ tag }} - {% endfor %} -
-
-
{{ dict_investigation['date']}}{{ dict_investigation['last_change']}}{{ dict_investigation['info']}}{{ dict_investigation['nb_objects']}}
+ + + Name + Date + last modified + Info + Nb Objects + + + + {% for dict_investigation in investigations %} + + + + {{ dict_investigation['info']}} +
+ {% for tag in dict_investigation['tags'] %} + {{ tag }} + {% endfor %} +
+
+ + {{ dict_investigation['date']}} + {{ dict_investigation['last_change']}} + {{ dict_investigation['info']}} + {{ dict_investigation['nb_objects']}} + + {% endfor %} + + - + + Create Investigation + + +