altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

refactor: Remove Google from document history search (#7093)

Browse source 
* refactor: Remove Google from document history search

"Search lists" dropdown menu devolves into a single button
(two buttons for ADs).

* refactor: Remove unused ARO search

---------

Co-authored-by: Robert Sparks <rjsparks@nostrum.com>
This commit is contained in:
Paul Selkirk 2024-02-28 10:58:21 -05:00 committed by GitHub
parent 01a071962d
commit 08e0c83324
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ietf/doc/views_doc.py
View file

@ -1,4 +1,4 @@
# Copyright The IETF Trust 2009-2023, All Rights Reserved # Copyright The IETF Trust 2009-2024, All Rights Reserved
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Parts Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). # Parts Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
@ -40,7 +40,6 @@ import json
import os import os
import re import re
from urllib.parse import quote
from pathlib import Path from pathlib import Path
from django.http import HttpResponse, Http404 from django.http import HttpResponse, Http404
@ -480,13 +479,6 @@ def document_main(request, name, rev=None, document_html=False):
can_submit_unsolicited_review_for_teams = Group.objects.filter( can_submit_unsolicited_review_for_teams = Group.objects.filter(
reviewteamsettings__isnull=False, role__person__user=request.user, role__name='secr') reviewteamsettings__isnull=False, role__person__user=request.user, role__name='secr')
# mailing list search archive
search_archive = "www.ietf.org/mail-archive/web/"
if doc.stream_id == "ietf" and group.type_id == "wg" and group.list_archive:
search_archive = group.list_archive
search_archive = quote(search_archive, safe="~")
# conflict reviews # conflict reviews
conflict_reviews = [r.source.name for r in interesting_relations_that.filter(relationship="conflrev")] conflict_reviews = [r.source.name for r in interesting_relations_that.filter(relationship="conflrev")]
@ -705,7 +697,6 @@ def document_main(request, name, rev=None, document_html=False):
iana_experts_comment=iana_experts_comment, iana_experts_comment=iana_experts_comment,
started_iesg_process=started_iesg_process, started_iesg_process=started_iesg_process,
shepherd_writeup=shepherd_writeup, shepherd_writeup=shepherd_writeup,
search_archive=search_archive,
actions=actions, actions=actions,
presentations=presentations, presentations=presentations,
review_assignments=review_assignments, review_assignments=review_assignments,

49
ietf/templates/doc/document_draft.html
View file

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{# Copyright The IETF Trust 2016-2023, All Rights Reserved #} {# Copyright The IETF Trust 2016-2024, All Rights Reserved #}
{% load origin %} {% load origin %}
{% load static %} {% load static %}
{% load ietf_filters %} {% load ietf_filters %}
@ -658,45 +658,14 @@
</i> </i>
Nits Nits
</a> </a>
<div class="dropdown inline"> <a class="btn btn-primary btn-sm"
<button class="btn btn-primary btn-sm dropdown-toggle" href="https://mailarchive.ietf.org/arch/search/?q=%22{{ doc.name }}%22"
type="button" rel="nofollow"
id="ddSearchMenu" target="_blank">
data-bs-toggle="dropdown" <i class="bi bi-search">
aria-expanded="true"> </i>
<i class="bi bi-search"> Search email archive
</i> </a>
Search lists
</button>
<ul class="dropdown-menu" role="menu">
<li role="presentation">
<a class="dropdown-item"
href="https://mailarchive.ietf.org/arch/search/?q=%22{{ doc.name }}%22"
rel="nofollow"
target="_blank">
IETF Mail Archive
</a>
</li>
<li role="presentation">
<a class="dropdown-item"
href="https://www.google.com/search?as_q={{ doc.name }}&amp;as_sitesearch={{ search_archive }}"
rel="nofollow"
target="_blank">
Google
</a>
</li>
{% if user|has_role:"Area Director" %}
<li role="presentation">
<a class="dropdown-item"
href="https://www.iesg.org/bin/c5i?mid=6&amp;rid=77&amp;target={{ doc.name }}"
rel="nofollow"
target="_blank">
ARO
</a>
</li>
{% endif %}
</ul>
</div>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<a class="btn btn-primary btn-sm track-untrack-doc {% if not doc.tracked_in_personal_community_list %}d-none{% endif %}" <a class="btn btn-primary btn-sm track-untrack-doc {% if not doc.tracked_in_personal_community_list %}d-none{% endif %}"
href="{% url "ietf.community.views.untrack_document" email_or_name=user.username name=doc.name %}" href="{% url "ietf.community.views.untrack_document" email_or_name=user.username name=doc.name %}"