From 2b735e3b97edbe303cca734399782757ca073b3c Mon Sep 17 00:00:00 2001 From: Terrtia Date: Mon, 20 Jan 2020 15:13:03 +0100 Subject: [PATCH] chg: [UI item tags search] refractor: search item tag by object, use new functions --- bin/packages/Date.py | 2 + bin/packages/Tag.py | 21 +- var/www/blueprints/tags_ui.py | 25 +- .../PasteSubmit/templates/submit_items.html | 2 +- var/www/modules/Tags/Flask_Tags.py | 268 +++++++++--------- .../modules/Tags/templates/header_Tags.html | 2 +- .../hiddenServices/templates/domains.html | 2 +- .../modules/hunter/templates/showTracker.html | 4 +- .../hunter/templates/trackersManagement.html | 4 +- var/www/modules/search/templates/search.html | 4 +- var/www/modules/showpaste/Flask_showpaste.py | 1 + .../crawler/crawler_splash/showDomain.html | 2 +- var/www/templates/modals/show_min_item.html | 114 ++++++++ var/www/templates/nav_bar.html | 4 +- .../templates/tags/block_obj_tags_search.html | 100 ++++--- var/www/templates/tags/menu_sidebar.html | 18 +- .../templates/tags/search_obj_by_tags.html | 46 +++ 17 files changed, 404 insertions(+), 215 deletions(-) create mode 100644 var/www/templates/modals/show_min_item.html diff --git a/bin/packages/Date.py b/bin/packages/Date.py index 74563cb5..14be5b6b 100644 --- a/bin/packages/Date.py +++ b/bin/packages/Date.py @@ -126,6 +126,8 @@ def validate_str_date(str_date, separator=''): return True except ValueError: return False + except TypeError: + return False def sanitise_date_range(date_from, date_to, separator=''): ''' diff --git a/bin/packages/Tag.py b/bin/packages/Tag.py index f011bb41..dba1b26e 100755 --- a/bin/packages/Tag.py +++ b/bin/packages/Tag.py @@ -446,7 +446,7 @@ def delete_obj_tags(object_id, object_type, tags=[]): return res def sanitise_tags_date_range(l_tags, date_from=None, date_to=None): - if date_from and date_to is None: + if date_from or date_to is None: date_from = get_tags_min_last_seen(l_tags, r_int=False) date_to = date_from return Date.sanitise_date_range(date_from, date_to) @@ -473,7 +473,7 @@ def get_obj_by_tags(object_type, l_tags, date_from=None, date_to=None, nb_obj=50 if object_type=='item': #sanityze date date_range = sanitise_tags_date_range(l_tags, date_from=date_from, date_to=date_to) - l_dates = Date.substract_date(date_from, date_to) + l_dates = Date.substract_date(date_range['date_from'], date_range['date_to']) for date_day in l_dates: l_set_keys = get_obj_keys_by_tags(object_type, l_tags, date_day) @@ -499,12 +499,21 @@ def get_obj_by_tags(object_type, l_tags, date_from=None, date_to=None, nb_obj=50 if page > nb_pages: page = nb_pages - # select index start = nb_obj*(page -1) - stop = (nb_obj*page) -1 - l_tagged_obj = l_tagged_obj[start:stop] + if nb_pages > 1: + stop = (nb_obj*page) + l_tagged_obj = l_tagged_obj[start:stop] + # only one page + else: + stop = nb_all_elem + l_tagged_obj = l_tagged_obj[start:] - return {"tagged_obj":l_tagged_obj, "page":page, "nb_pages":nb_pages, "nb_first_elem":start+1, "nb_last_elem":stop+1, "nb_all_elem":nb_all_elem} + if stop > nb_all_elem: + stop = nb_all_elem + stop = stop -1 + + return {"tagged_obj":l_tagged_obj, "date" : date_range, + "page":page, "nb_pages":nb_pages, "nb_first_elem":start+1, "nb_last_elem":stop+1, "nb_all_elem":nb_all_elem} # without daterange else: diff --git a/var/www/blueprints/tags_ui.py b/var/www/blueprints/tags_ui.py index 9f5e8e7b..56cd788f 100644 --- a/var/www/blueprints/tags_ui.py +++ b/var/www/blueprints/tags_ui.py @@ -94,6 +94,15 @@ def get_all_obj_tags(): return jsonify(res) return jsonify(Tag.get_all_obj_tags(object_type)) +@tags_ui.route('/tag/search/item') +@login_required +@login_read_only +def tags_search_items(): + object_type = 'item' + dict_tagged = {"object_type":object_type, "object_name":object_type.title() + "s"} + dict_tagged['date'] = Date.sanitise_date_range('', '', separator='-') + return render_template("tags/search_obj_by_tags.html", bootstrap_label=bootstrap_label, dict_tagged=dict_tagged) + @tags_ui.route('/tag/search/domain') @login_required @login_read_only @@ -119,8 +128,14 @@ def get_obj_by_tags(): object_type = request.args.get('object_type') ltags = request.args.get('ltags') page = request.args.get('page') - date_from = request.args.get('ltags') - date_to = request.args.get('ltags') + date_from = request.args.get('date_from') + date_to = request.args.get('date_to') + + # remove date separator + if date_from: + date_from = date_from.replace('-', '') + if date_to: + date_to = date_to.replace('-', '') # unpack tags list_tags = ltags.split(',') @@ -139,12 +154,13 @@ def get_obj_by_tags(): except: page = 1 - dict_obj = Tag.get_obj_by_tags(object_type, list_tag, page=page) + dict_obj = Tag.get_obj_by_tags(object_type, list_tag, date_from=date_from, date_to=date_to, page=page) if dict_obj['tagged_obj']: dict_tagged = {"object_type":object_type, "object_name":object_type.title() + "s", "tagged_obj":[], "page":dict_obj['page'] ,"nb_pages":dict_obj['nb_pages'], "nb_first_elem":dict_obj['nb_first_elem'], "nb_last_elem":dict_obj['nb_last_elem'], "nb_all_elem":dict_obj['nb_all_elem']} + for obj_id in dict_obj['tagged_obj']: obj_metadata = Correlate_object.get_object_metadata(object_type, obj_id) obj_metadata['id'] = obj_id @@ -162,4 +178,7 @@ def get_obj_by_tags(): else: dict_tagged = {"object_type":object_type, "object_name":object_type.title() + "s"} + if 'date' in dict_obj: + dict_tagged['date'] = dict_obj['date'] + return render_template("tags/search_obj_by_tags.html", bootstrap_label=bootstrap_label, dict_tagged=dict_tagged) diff --git a/var/www/modules/PasteSubmit/templates/submit_items.html b/var/www/modules/PasteSubmit/templates/submit_items.html index 454b8e7a..ad22c660 100644 --- a/var/www/modules/PasteSubmit/templates/submit_items.html +++ b/var/www/modules/PasteSubmit/templates/submit_items.html @@ -62,7 +62,7 @@
- diff --git a/var/www/modules/Tags/Flask_Tags.py b/var/www/modules/Tags/Flask_Tags.py index d2252877..fa8873ba 100644 --- a/var/www/modules/Tags/Flask_Tags.py +++ b/var/www/modules/Tags/Flask_Tags.py @@ -123,139 +123,139 @@ def get_last_seen_from_tags_list(list_tags): # ============= ROUTES ============== -@Tags.route("/tags/", methods=['GET']) -@login_required -@login_read_only -def Tags_page(): - date_from = request.args.get('date_from') - date_to = request.args.get('date_to') - tags = request.args.get('ltags') - - if tags is None: - dates = get_all_dates_range(date_from, date_to) - return render_template("Tags.html", date_from=dates['date_from'], date_to=dates['date_to']) - - # unpack tags - list_tags = tags.split(',') - list_tag = [] - for tag in list_tags: - list_tag.append(tag.replace('"','\"')) - - #no search by date, use last_seen for date_from/date_to - if date_from is None and date_to is None and tags is not None: - date_from = get_last_seen_from_tags_list(list_tags) - date_to = date_from - - # TODO verify input - - dates = get_all_dates_range(date_from, date_to) - - if(type(list_tags) is list): - # no tag - if list_tags is False: - print('empty') - # 1 tag - elif len(list_tags) < 2: - tagged_pastes = [] - for date in dates['date_range']: - tagged_pastes.extend(r_serv_tags.smembers('{}:{}'.format(list_tags[0], date))) - - # 2 tags or more - else: - tagged_pastes = [] - for date in dates['date_range']: - tag_keys = [] - for tag in list_tags: - tag_keys.append('{}:{}'.format(tag, date)) - - if len(tag_keys) > 1: - daily_items = r_serv_tags.sinter(tag_keys[0], *tag_keys[1:]) - else: - daily_items = r_serv_tags.sinter(tag_keys[0]) - tagged_pastes.extend(daily_items) - - else : - return 'INCORRECT INPUT' - - all_content = [] - paste_date = [] - paste_linenum = [] - all_path = [] - allPastes = list(tagged_pastes) - paste_tags = [] - - try: - page = int(request.args.get('page')) - except: - page = 1 - if page <= 0: - page = 1 - nb_page_max = len(tagged_pastes)/(max_tags_result) - if not nb_page_max.is_integer(): - nb_page_max = int(nb_page_max)+1 - else: - nb_page_max = int(nb_page_max) - if page > nb_page_max: - page = nb_page_max - start = max_tags_result*(page -1) - stop = max_tags_result*page - - for path in allPastes[start:stop]: - all_path.append(path) - paste = Paste.Paste(path) - content = paste.get_p_content() - content_range = max_preview_char if len(content)>max_preview_char else len(content)-1 - all_content.append(content[0:content_range].replace("\"", "\'").replace("\r", " ").replace("\n", " ")) - curr_date = str(paste._get_p_date()) - curr_date = curr_date[0:4]+'/'+curr_date[4:6]+'/'+curr_date[6:] - paste_date.append(curr_date) - paste_linenum.append(paste.get_lines_info()[0]) - p_tags = r_serv_metadata.smembers('tag:'+path) - complete_tags = [] - l_tags = [] - for tag in p_tags: - complete_tag = tag - - tag = tag.split('=') - if len(tag) > 1: - if tag[1] != '': - tag = tag[1][1:-1] - # no value - else: - tag = tag[0][1:-1] - # use for custom tags - else: - tag = tag[0] - - l_tags.append( (tag,complete_tag) ) - - paste_tags.append(l_tags) - - if len(allPastes) > 10: - finished = False - else: - finished = True - - if len(list_tag) == 1: - tag_nav=tags.replace('"', '').replace('=', '').replace(':', '') - else: - tag_nav='empty' - - return render_template("Tags.html", - all_path=all_path, - tags=tags, - tag_nav=tag_nav, - list_tag = list_tag, - date_from=dates['date_from'], - date_to=dates['date_to'], - page=page, nb_page_max=nb_page_max, - paste_tags=paste_tags, - bootstrap_label=bootstrap_label, - content=all_content, - paste_date=paste_date, - paste_linenum=paste_linenum, - char_to_display=max_preview_modal, - finished=finished) +# @Tags.route("/tags/", methods=['GET']) +# @login_required +# @login_read_only +# def Tags_page(): +# date_from = request.args.get('date_from') +# date_to = request.args.get('date_to') +# tags = request.args.get('ltags') +# +# if tags is None: +# dates = get_all_dates_range(date_from, date_to) +# return render_template("Tags.html", date_from=dates['date_from'], date_to=dates['date_to']) +# +# # unpack tags +# list_tags = tags.split(',') +# list_tag = [] +# for tag in list_tags: +# list_tag.append(tag.replace('"','\"')) +# +# #no search by date, use last_seen for date_from/date_to +# if date_from is None and date_to is None and tags is not None: +# date_from = get_last_seen_from_tags_list(list_tags) +# date_to = date_from +# +# # TODO verify input +# +# dates = get_all_dates_range(date_from, date_to) +# +# if(type(list_tags) is list): +# # no tag +# if list_tags is False: +# print('empty') +# # 1 tag +# elif len(list_tags) < 2: +# tagged_pastes = [] +# for date in dates['date_range']: +# tagged_pastes.extend(r_serv_tags.smembers('{}:{}'.format(list_tags[0], date))) +# +# # 2 tags or more +# else: +# tagged_pastes = [] +# for date in dates['date_range']: +# tag_keys = [] +# for tag in list_tags: +# tag_keys.append('{}:{}'.format(tag, date)) +# +# if len(tag_keys) > 1: +# daily_items = r_serv_tags.sinter(tag_keys[0], *tag_keys[1:]) +# else: +# daily_items = r_serv_tags.sinter(tag_keys[0]) +# tagged_pastes.extend(daily_items) +# +# else : +# return 'INCORRECT INPUT' +# +# all_content = [] +# paste_date = [] +# paste_linenum = [] +# all_path = [] +# allPastes = list(tagged_pastes) +# paste_tags = [] +# +# try: +# page = int(request.args.get('page')) +# except: +# page = 1 +# if page <= 0: +# page = 1 +# nb_page_max = len(tagged_pastes)/(max_tags_result) +# if not nb_page_max.is_integer(): +# nb_page_max = int(nb_page_max)+1 +# else: +# nb_page_max = int(nb_page_max) +# if page > nb_page_max: +# page = nb_page_max +# start = max_tags_result*(page -1) +# stop = max_tags_result*page +# +# for path in allPastes[start:stop]: +# all_path.append(path) +# paste = Paste.Paste(path) +# content = paste.get_p_content() +# content_range = max_preview_char if len(content)>max_preview_char else len(content)-1 +# all_content.append(content[0:content_range].replace("\"", "\'").replace("\r", " ").replace("\n", " ")) +# curr_date = str(paste._get_p_date()) +# curr_date = curr_date[0:4]+'/'+curr_date[4:6]+'/'+curr_date[6:] +# paste_date.append(curr_date) +# paste_linenum.append(paste.get_lines_info()[0]) +# p_tags = r_serv_metadata.smembers('tag:'+path) +# complete_tags = [] +# l_tags = [] +# for tag in p_tags: +# complete_tag = tag +# +# tag = tag.split('=') +# if len(tag) > 1: +# if tag[1] != '': +# tag = tag[1][1:-1] +# # no value +# else: +# tag = tag[0][1:-1] +# # use for custom tags +# else: +# tag = tag[0] +# +# l_tags.append( (tag,complete_tag) ) +# +# paste_tags.append(l_tags) +# +# if len(allPastes) > 10: +# finished = False +# else: +# finished = True +# +# if len(list_tag) == 1: +# tag_nav=tags.replace('"', '').replace('=', '').replace(':', '') +# else: +# tag_nav='empty' +# +# return render_template("Tags.html", +# all_path=all_path, +# tags=tags, +# tag_nav=tag_nav, +# list_tag = list_tag, +# date_from=dates['date_from'], +# date_to=dates['date_to'], +# page=page, nb_page_max=nb_page_max, +# paste_tags=paste_tags, +# bootstrap_label=bootstrap_label, +# content=all_content, +# paste_date=paste_date, +# paste_linenum=paste_linenum, +# char_to_display=max_preview_modal, +# finished=finished) @Tags.route("/Tags/get_all_tags") @@ -369,7 +369,7 @@ def get_tags_galaxy(): @Tags.route("/Tags/remove_tag") @login_required @login_analyst -def remove_tag(): #TODO remove me , used by showpaste +def remove_tag(): #TODO remove me , used by showpaste path = request.args.get('paste') tag = request.args.get('tag') diff --git a/var/www/modules/Tags/templates/header_Tags.html b/var/www/modules/Tags/templates/header_Tags.html index 624adb2f..58d001fa 100644 --- a/var/www/modules/Tags/templates/header_Tags.html +++ b/var/www/modules/Tags/templates/header_Tags.html @@ -1 +1 @@ -
  • Tags
    • +
  • Tags
    • diff --git a/var/www/modules/hiddenServices/templates/domains.html b/var/www/modules/hiddenServices/templates/domains.html index 5854a8f4..c9613380 100644 --- a/var/www/modules/hiddenServices/templates/domains.html +++ b/var/www/modules/hiddenServices/templates/domains.html @@ -67,7 +67,7 @@ {{ domain }}
    {% for tag in domain_metadata[domain]['tags'] %} - + {{ tag }} {{ domain_metadata[domain]['tags'][tag] }} {% endfor %} diff --git a/var/www/modules/hunter/templates/showTracker.html b/var/www/modules/hunter/templates/showTracker.html index 7c149205..29e8b103 100644 --- a/var/www/modules/hunter/templates/showTracker.html +++ b/var/www/modules/hunter/templates/showTracker.html @@ -92,7 +92,7 @@ {% for tag in tracker_metadata['tags'] %} - + {{ tag }} {% endfor %} @@ -227,7 +227,7 @@
    {% for tag in item['tags'] %} - + {{ tag }} {% endfor %} diff --git a/var/www/modules/hunter/templates/trackersManagement.html b/var/www/modules/hunter/templates/trackersManagement.html index 63b7758e..37d6f189 100644 --- a/var/www/modules/hunter/templates/trackersManagement.html +++ b/var/www/modules/hunter/templates/trackersManagement.html @@ -68,7 +68,7 @@ {{dict_uuid['term']}}
    {% for tag in dict_uuid['tags'] %} - + {{ tag }} {% endfor %} @@ -121,7 +121,7 @@ {{dict_uuid['term']}}
    {% for tag in dict_uuid['tags'] %} - + {{ tag }} {% endfor %} diff --git a/var/www/modules/search/templates/search.html b/var/www/modules/search/templates/search.html index 46b73091..eb30c0bc 100644 --- a/var/www/modules/search/templates/search.html +++ b/var/www/modules/search/templates/search.html @@ -101,7 +101,7 @@ {{ path }}
    {% for tag in paste_tags[loop.index0] %} - + {{ tag[0] }} {% endfor %} @@ -201,7 +201,7 @@ var curr_preview = data.preview_array[i].replace(/\"/g, "\'"); var tag = "" for(j=0; j" + tag = tag + "" + "" + data.list_tags[i][j][0] + "" + "" } diff --git a/var/www/modules/showpaste/Flask_showpaste.py b/var/www/modules/showpaste/Flask_showpaste.py index 4e787238..ee4be6ad 100644 --- a/var/www/modules/showpaste/Flask_showpaste.py +++ b/var/www/modules/showpaste/Flask_showpaste.py @@ -361,6 +361,7 @@ def show_item_min(requested_path , content_range=0): if 'infoleak:submission="crawler"' in l_tags: crawler_metadata['get_metadata'] = True crawler_metadata['domain'] = r_serv_metadata.hget('paste_metadata:'+relative_path, 'domain') + crawler_metadata['domain'] = crawler_metadata['domain'].rsplit(':', 1)[0] crawler_metadata['paste_father'] = r_serv_metadata.hget('paste_metadata:'+relative_path, 'father') crawler_metadata['real_link'] = r_serv_metadata.hget('paste_metadata:'+relative_path,'real_link') crawler_metadata['screenshot'] = get_item_screenshot_path(relative_path) diff --git a/var/www/templates/crawler/crawler_splash/showDomain.html b/var/www/templates/crawler/crawler_splash/showDomain.html index 80912dcc..75371b6d 100644 --- a/var/www/templates/crawler/crawler_splash/showDomain.html +++ b/var/www/templates/crawler/crawler_splash/showDomain.html @@ -351,7 +351,7 @@
    {% for tag in item["tags"] %} - + {{ tag["min_tag"] }} {% endfor %} diff --git a/var/www/templates/modals/show_min_item.html b/var/www/templates/modals/show_min_item.html new file mode 100644 index 00000000..69ff1239 --- /dev/null +++ b/var/www/templates/modals/show_min_item.html @@ -0,0 +1,114 @@ + + + diff --git a/var/www/templates/nav_bar.html b/var/www/templates/nav_bar.html index 7621f10a..2f50dfd1 100644 --- a/var/www/templates/nav_bar.html +++ b/var/www/templates/nav_bar.html @@ -16,7 +16,7 @@ Submit
  • - Browse Items + Tags
  • Leaks Hunter @@ -34,7 +34,7 @@ Server Management
  • - Log Out + Log Out
    • diff --git a/var/www/templates/tags/block_obj_tags_search.html b/var/www/templates/tags/block_obj_tags_search.html index 8669f4db..c44cef33 100644 --- a/var/www/templates/tags/block_obj_tags_search.html +++ b/var/www/templates/tags/block_obj_tags_search.html @@ -4,20 +4,22 @@
    - + {%endif%}
    @@ -53,51 +55,47 @@ function searchTags() { var data = ltags.getValue(); - //var date_from = $('#date-range-from-input').val(); - //var date_to =$('#date-range-to-input').val(); - //parameter = parameter + "&date_from="+date_from+"&date_to="+date_to var parameter = "?ltags=" + data + "&object_type={{ object_type }}{%if page%}&page={{ page }}{%endif%}"; + {%if object_type=='item'%} + var date_from = $('#date-range-from-input').val(); + var date_to =$('#date-range-to-input').val(); + parameter = parameter + "&date_from=" + date_from + "&date_to=" + date_to; + {%endif%} window.location.replace("{{ url_for('tags_ui.get_obj_by_tags') }}" + parameter); } function emptyTags() { ltags.clear(); } - // $('#date-range-from').dateRangePicker({ - // separator : ' to ', - // getValue: function(){ - // if ($('#date-range-from-input').val() && $('#date-range-to-input').val() ) - // return $('#date-range-from-input').val() + ' to ' + $('#date-range-to-input').val(); - // else - // return ''; - // }, - // setValue: function(s,s1,s2){ - // $('#date-range-from-input').val(s1); - // $('#date-range-to-input').val(s2); - // } - // }); - // $('#date-range-to').dateRangePicker({ - // separator : ' to ', - // getValue: function(){ - // if ($('#date-range-from-input').val() && $('#date-range-to-input').val() ) - // return $('#date-range-from-input').val() + ' to ' + $('#date-range-to-input').val(); - // else - // return ''; - // }, - // setValue: function(s,s1,s2){ - // $('#date-range-from-input').val(s1); - // $('#date-range-to-input').val(s2); - // } - // }); -// tagid + objtype + objid -// $('#edit_tags_modal').on('show.bs.modal', function (event) { -// var button = $(event.relatedTarget); -// var tagid = button.data('tagid') -// var objtype = button.data('objtype') -// var objid = button.data('objid') -// var modal = $(this) -// modal.find('#modal_tag_edit_tag_id').text(tagid) -// modal.find('#modal_tag_edit_delete_tag').prop("href", "{{ url_for('tags_ui.delete_tag') }}?object_type="+ objtype +"&object_id="+ objid +"&tag="+ tagid) -// }) +{%if object_type=='item'%} + $('#date-range-from').dateRangePicker({ + separator : ' to ', + getValue: function(){ + if ($('#date-range-from-input').val() && $('#date-range-to-input').val() ) + return $('#date-range-from-input').val() + ' to ' + $('#date-range-to-input').val(); + else + return ''; + }, + setValue: function(s,s1,s2){ + $('#date-range-from-input').val(s1); + $('#date-range-to-input').val(s2); + } + }); + $('#date-range-to').dateRangePicker({ + separator : ' to ', + getValue: function(){ + if ($('#date-range-from-input').val() && $('#date-range-to-input').val() ) + return $('#date-range-from-input').val() + ' to ' + $('#date-range-to-input').val(); + else + return ''; + }, + setValue: function(s,s1,s2){ + $('#date-range-from-input').val(s1); + $('#date-range-to-input').val(s2); + } + }); + +{%endif%} + diff --git a/var/www/templates/tags/menu_sidebar.html b/var/www/templates/tags/menu_sidebar.html index 2bcff464..c6c6a041 100644 --- a/var/www/templates/tags/menu_sidebar.html +++ b/var/www/templates/tags/menu_sidebar.html @@ -11,7 +11,7 @@
    • - + Search Items by Tags @@ -62,49 +62,49 @@
      • - + Credentials
      • - + Credit cards
      • - + Mails
      • - + CVEs
      • - + Onions
      • - + Bitcoin
      • - + Base64
      • - + Phones diff --git a/var/www/templates/tags/search_obj_by_tags.html b/var/www/templates/tags/search_obj_by_tags.html index b898a5cf..b8f371a6 100644 --- a/var/www/templates/tags/search_obj_by_tags.html +++ b/var/www/templates/tags/search_obj_by_tags.html @@ -32,7 +32,15 @@
        + {%if dict_tagged["object_type"]=="item"%} + {% include 'modals/show_min_item.html' %} + {% endif %} + {% with object_type=dict_tagged['object_type'], current_tags=dict_tagged['current_tags'], object_name=dict_tagged['object_name'] %} + {%if 'date' in dict_tagged%} + {% set date_from= dict_tagged['date']['date_from'] %} + {% set date_to= dict_tagged['date']['date_to'] %} + {% endif %} {% include 'tags/block_obj_tags_search.html' %} {% endwith %} @@ -48,6 +56,10 @@ status {%elif dict_tagged["object_type"]=="image"%} Image + {%elif dict_tagged["object_type"]=="item"%} + Date + Item + Action {%endif%} @@ -104,6 +116,31 @@ {% endfor %} + + {%elif dict_tagged["object_type"]=="item"%} + {% for dict_obj in dict_tagged["tagged_obj"] %} + + {{ dict_obj['date'] }} + + +
        {{ dict_obj['id'] }}
        +         +
        + {% for tag in dict_obj['tags'] %} + + {{ tag }} + + {% endfor %} +
        + + + + + + + {% endfor %} {% endif %} @@ -114,6 +151,9 @@ {% with page=dict_tagged['page'], nb_page_max=dict_tagged['nb_pages'], nb_first_elem=dict_tagged['nb_first_elem'], nb_last_elem=dict_tagged['nb_last_elem'], nb_all_elem=dict_tagged['nb_all_elem'] %} {% set object_name= dict_tagged['object_name'] %} {% set target_url=url_for('tags_ui.get_obj_by_tags') + "?object_type=" + dict_tagged['object_type'] + "<ags=" + dict_tagged['current_tags_str'] %} + {%if dict_tagged["object_type"]=="item"%} + {% set target_url= target_url + "&date_from=" + dict_tagged['date']['date_from'] + "&date_to=" + dict_tagged['date']['date_to'] %} + {%endif%} {% include 'pagination.html' %} {% endwith %} {%endif%} @@ -129,10 +169,16 @@ var ltags; var search_table; $(document).ready(function(){ + $("#navbar-tags").addClass("active"); $("#nav_tags_search").removeClass("text-muted"); $("#nav_tags_search_{{dict_tagged['object_type']}}").addClass("active"); $('#myTable_').DataTable({ "lengthMenu": [ 5, 10, 25, 50, 100 ], "pageLength": 10, "order": [[ 0, "asc" ]] }); + {%if dict_tagged["object_type"]=="item"%} + $("[data-toggle='modal']").off('click.openmodal').on("click.openmodal", function (event) { + get_html_and_update_modal(event, $(this)); + }); + {%endif%} });