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

fix: [ui tag selector] force custom tags

pull/586/head
Terrtia 2022-05-19 13:57:07 +02:00
parent a3e576ed49
commit df4bb531d2
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/core/ail_2_ail.py
View File

@ -1028,8 +1028,9 @@ def api_create_sync_queue(json_dict):
tags = json_dict.get('tags') tags = json_dict.get('tags')
if not tags: if not tags:
return {"status": "error", "reason": "no tags provided"}, 400 return {"status": "error", "reason": "no tags provided"}, 400
if not Tag.are_enabled_tags(tags): # FIXME: add custom tags
return {"status": "error", "reason": "Invalid/Disabled tags"}, 400 # if not Tag.are_enabled_tags(tags):
# return {"status": "error", "reason": "Invalid/Disabled tags"}, 400
max_size = json_dict.get('max_size') max_size = json_dict.get('max_size')
if not max_size: if not max_size:
@ -1064,8 +1065,9 @@ def api_edit_sync_queue(json_dict):
tags = json_dict.get('tags') tags = json_dict.get('tags')
if tags: if tags:
if not Tag.are_enabled_tags(tags): # FIXME: add custom tags
return {"status": "error", "reason": "Invalid/Disabled tags"}, 400 # if not Tag.are_enabled_tags(tags):
# return {"status": "error", "reason": "Invalid/Disabled tags"}, 400
edit_sync_queue_filter_tags(queue_uuid, tags) edit_sync_queue_filter_tags(queue_uuid, tags)
max_size = json_dict.get('max_size') max_size = json_dict.get('max_size')

3
var/www/templates/tags/block_tags_selector.html
View File

@ -35,6 +35,7 @@
</div> </div>
<!-- <!--
<button class="btn btn-primary" onclick="tagsSelector()"> <button class="btn btn-primary" onclick="tagsSelector()">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
@ -47,7 +48,7 @@
var ltags; var ltags;
var ltagsgalaxies; var ltagsgalaxies;
$.getJSON("{{ url_for('tags_ui.tag_taxonomies_tags_enabled_json') }}", $.getJSON("{{ url_for('Tags.get_all_tags') }}",
function(data) { function(data) {
{% if 'taxonomies_tags' in tags_selector_data %} {% if 'taxonomies_tags' in tags_selector_data %}
var valueData = [ var valueData = [