From cd748cd760ae8efbd90b4f96fd6f13af7a81efac Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Wed, 13 Oct 2021 21:43:44 +0000 Subject: [PATCH] Update internal references to trac.tools.ietf.org to point to trac.ietf.org. Remove several links into tools.ietf.org. Commit ready for merge. - Legacy-Id: 19422 --- ietf/doc/templatetags/ballot_icon.py | 4 +- ietf/group/models.py | 5 +-- ietf/group/utils.py | 5 +-- .../commands/create_dummy_meeting.py | 4 +- .../management/commands/generate_schedule.py | 4 +- ietf/redirects/views.py | 4 +- ietf/review/policies.py | 4 +- ietf/review/tests_policies.py | 4 +- ietf/templates/base.html | 3 +- ietf/templates/group/concluded_groups.html | 4 +- ietf/templates/meeting/agenda.html | 15 +++++-- .../templates/meeting/agenda_personalize.html | 15 ++++--- ietf/wsgi.py | 41 +------------------ 13 files changed, 40 insertions(+), 72 deletions(-) diff --git a/ietf/doc/templatetags/ballot_icon.py b/ietf/doc/templatetags/ballot_icon.py index 2c3d6bcb2..e4582d699 100644 --- a/ietf/doc/templatetags/ballot_icon.py +++ b/ietf/doc/templatetags/ballot_icon.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2012-2020, All Rights Reserved +# Copyright The IETF Trust 2012-2021, All Rights Reserved # Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen # @@ -181,7 +181,7 @@ def state_age_colored(doc): state_date = datetime.date(1990,1,1) days = (datetime.date.today() - state_date).days # loosely based on - # http://trac.tools.ietf.org/group/iesg/trac/wiki/PublishPath + # https://trac.ietf.org/trac/iesg/wiki/PublishPath if iesg_state == "lc": goal1 = 30 goal2 = 30 diff --git a/ietf/group/models.py b/ietf/group/models.py index aae5c4807..018ff74e2 100644 --- a/ietf/group/models.py +++ b/ietf/group/models.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2010-2020, All Rights Reserved +# Copyright The IETF Trust 2010-2021, All Rights Reserved # -*- coding: utf-8 -*- @@ -190,9 +190,6 @@ class Group(GroupInfo): group1['comments'] = self.comments return group1 - def has_tools_page(self): - return self.type_id in ['wg', ] and self.state_id in ['active', 'dormant', 'replaced', 'conclude'] - def liaison_approvers(self): '''Returns roles that have liaison statement approval authority for group''' diff --git a/ietf/group/utils.py b/ietf/group/utils.py index b5fbd1387..dbce474db 100644 --- a/ietf/group/utils.py +++ b/ietf/group/utils.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2012-2020, All Rights Reserved +# Copyright The IETF Trust 2012-2021, All Rights Reserved # -*- coding: utf-8 -*- @@ -208,8 +208,7 @@ def construct_group_menu_context(request, group, selected, group_type, others): entries.append(("Email expansions", urlreverse("ietf.group.views.email", kwargs=kwargs))) if group.list_archive.startswith("http:") or group.list_archive.startswith("https:") or group.list_archive.startswith("ftp:"): entries.append((mark_safe("List archive »"), group.list_archive)) - if group.has_tools_page(): - entries.append((mark_safe("Tools »"), "https://tools.ietf.org/%s/%s/" % (group.type_id, group.acronym))) + # actions actions = [] diff --git a/ietf/meeting/management/commands/create_dummy_meeting.py b/ietf/meeting/management/commands/create_dummy_meeting.py index 61c7e89c6..79b1e5db6 100644 --- a/ietf/meeting/management/commands/create_dummy_meeting.py +++ b/ietf/meeting/management/commands/create_dummy_meeting.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2020, All Rights Reserved +# Copyright The IETF Trust 2020-2021, All Rights Reserved # -*- coding: utf-8 -*- # This command generates a Meeting (IETF 999) with Rooms, TimeSlots, Sessions and Constraints. @@ -14,7 +14,7 @@ # can be translated to the newly expanded Constraint objects. # # This work was done in the context of the new meeting constraints modelling: -# https://trac.tools.ietf.org/tools/ietfdb/wiki/MeetingConstraints +# https://trac.ietf.org/trac/ietfdb/wiki/MeetingConstraints # Note that aside from Constraint objects, as created below, there is also # business logic that applies to all sessions, which is to be implemented # in the automatic schedule builder. diff --git a/ietf/meeting/management/commands/generate_schedule.py b/ietf/meeting/management/commands/generate_schedule.py index fd38b10c6..ade11ef08 100644 --- a/ietf/meeting/management/commands/generate_schedule.py +++ b/ietf/meeting/management/commands/generate_schedule.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2020, All Rights Reserved +# Copyright The IETF Trust 2021, All Rights Reserved # For an overview of this process and context, see: -# https://trac.tools.ietf.org/tools/ietfdb/wiki/MeetingConstraints +# https://trac.ietf.org/trac/ietfdb/wiki/MeetingConstraints from __future__ import absolute_import, print_function, unicode_literals import calendar diff --git a/ietf/redirects/views.py b/ietf/redirects/views.py index 597e39cec..af8cbf555 100644 --- a/ietf/redirects/views.py +++ b/ietf/redirects/views.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007-2020, All Rights Reserved +# Copyright The IETF Trust 2007-2021, All Rights Reserved # -*- coding: utf-8 -*- @@ -48,7 +48,7 @@ def redirect(request, path="", script=""): pass # it's ok, request didn't have 'command'. except: pass # strange exception like the one described in - # http://merlot.tools.ietf.org/tools/ietfdb/ticket/179 ? + # https://trac.ietf.org/trac/ietfdb/ticket/179? # just ignore the command string. if cmd is not None: remove_args.append('command') diff --git a/ietf/review/policies.py b/ietf/review/policies.py index 30ded02a7..8799cd3d5 100644 --- a/ietf/review/policies.py +++ b/ietf/review/policies.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2019-2020, All Rights Reserved +# Copyright The IETF Trust 2019-2021, All Rights Reserved import re @@ -23,7 +23,7 @@ from ietf.utils import log """ This file contains policies regarding reviewer queues. The policies are documented in more detail on: -https://trac.tools.ietf.org/tools/ietfdb/wiki/ReviewerQueuePolicy +https://trac.ietf.org/trac/ietfdb/wiki/ReviewerQueuePolicy Terminology used here should match terminology used in that document. """ diff --git a/ietf/review/tests_policies.py b/ietf/review/tests_policies.py index e1826e9ea..b4ae5242d 100644 --- a/ietf/review/tests_policies.py +++ b/ietf/review/tests_policies.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2016-2019, All Rights Reserved +# Copyright The IETF Trust 2016-2021, All Rights Reserved import debug # pyflakes:ignore import datetime @@ -834,7 +834,7 @@ class AssignmentOrderResolverTests(TestCase): self.assertEqual(len(ranking), 2) self.assertEqual(ranking[0]['email'], reviewer_high.email()) self.assertEqual(ranking[1]['email'], reviewer_low.email()) - # These scores follow the ordering of https://trac.tools.ietf.org/tools/ietfdb/wiki/ReviewerQueuePolicy, + # These scores follow the ordering of https://trac.ietf.org/trac/ietfdb/wiki/ReviewerQueuePolicy, self.assertEqual(ranking[0]['scores'], [ 1, 1, 1, 1, 1, 1, 0, 0, -1]) self.assertEqual(ranking[1]['scores'], [-1, -1, -1, -1, -1, -1, -91, -2, 0]) self.assertEqual(ranking[0]['label'], 'Test Reviewer-high: unavailable indefinitely (Can do follow-ups); requested to be selected next for assignment; reviewed document before; wishes to review document; #2; 1 no response, 1 partially complete, 1 fully completed') diff --git a/ietf/templates/base.html b/ietf/templates/base.html index 491543cc2..5e85099ee 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -1,5 +1,5 @@ {% load ietf_filters static %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2021, All Rights Reserved #} {% load origin %}{% origin %} {% load bootstrap3 %} @@ -129,7 +129,6 @@ IAB IANA Privacy Statement - IETF Tools diff --git a/ietf/templates/group/concluded_groups.html b/ietf/templates/group/concluded_groups.html index a93d51b89..406cc431c 100644 --- a/ietf/templates/group/concluded_groups.html +++ b/ietf/templates/group/concluded_groups.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2021, All Rights Reserved #} {% load origin static %} {% block pagehead %} @@ -36,10 +36,12 @@
{% if label == "WGs" %} +{% comment "Replace this if that tools page is moved" %}

Some additional concluded WGs may be present here.

+{% endcomment %} {% elif label == "RGs" %}

The information below is incomplete and misses a few older RGs. diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 70f6fdbd8..363082e21 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2021, All Rights Reserved #} {% load origin %} {% load static %} {% load ietf_filters %} @@ -182,7 +182,10 @@ {% if item.timeslot.show_location and item.timeslot.get_html_location %} {% if schedule.meeting.number|add:"0" < 96 %} - {{item.timeslot.get_html_location}} + {% comment %}{% endcomment %} + {{item.timeslot.get_html_location}} + } + {% comment %}{% endcomment %} {% elif item.timeslot.location.floorplan %} {{item.timeslot.get_html_location}} {% else %} @@ -248,7 +251,9 @@ {% if item.timeslot.show_location and item.timeslot.get_html_location %} {% if schedule.meeting.number|add:"0" < 96 %} - {{item.timeslot.get_html_location}} + {% comment %}{% endcomment %} + {{item.timeslot.get_html_location}} + {% comment %}{% endcomment %} {% elif item.timeslot.location.floorplan %} {{item.timeslot.get_html_location}} {% else %} @@ -271,7 +276,9 @@ {% if item.timeslot.show_location and item.timeslot.get_html_location %} {% if schedule.meeting.number|add:"0" < 96 %} - {{item.timeslot.get_html_location}} + {% comment %}{% endcomment %} + {{item.timeslot.get_html_location}} + {% comment %}{% endcomment %} {% elif item.timeslot.location.floorplan %} {{item.timeslot.get_html_location}} {% else %} diff --git a/ietf/templates/meeting/agenda_personalize.html b/ietf/templates/meeting/agenda_personalize.html index bee86b1d6..8d84be6bc 100644 --- a/ietf/templates/meeting/agenda_personalize.html +++ b/ietf/templates/meeting/agenda_personalize.html @@ -160,8 +160,9 @@ {% if item.timeslot.show_location and item.timeslot.get_html_location %} {% if schedule.meeting.number|add:"0" < 96 %} - {{ item.timeslot.get_html_location }} + {% comment %}{% endcomment $} + {{ item.timeslot.get_html_location }} + {% comment %}{% endcomment %} {% elif item.timeslot.location.floorplan %} {{ item.timeslot.get_html_location }} @@ -227,8 +228,9 @@ {% if item.timeslot.show_location and item.timeslot.get_html_location %} {% if schedule.meeting.number|add:"0" < 96 %} - {{ item.timeslot.get_html_location }} + {% comment %}{% endcomment %} + {{ item.timeslot.get_html_location }} + {% comment %}{% endcomment %} {% elif item.timeslot.location.floorplan %} {{ item.timeslot.get_html_location }} @@ -254,8 +256,9 @@ {% if item.timeslot.show_location and item.timeslot.get_html_location %} {% if schedule.meeting.number|add:"0" < 96 %} - {{ item.timeslot.get_html_location }} + {% comment %}{% endcomment %} + {{ item.timeslot.get_html_location }} + {% comment %}{% endcomment %} {% elif item.timeslot.location.floorplan %} {{ item.timeslot.get_html_location }} diff --git a/ietf/wsgi.py b/ietf/wsgi.py index 11a0f39bc..c43334874 100644 --- a/ietf/wsgi.py +++ b/ietf/wsgi.py @@ -1,46 +1,7 @@ -# Copyright The IETF Trust 2013-2020, All Rights Reserved +# Copyright The IETF Trust 2013-2021, All Rights Reserved # -*- coding: utf-8 -*- -""" -WSGI configuration for the datatracker. - -The following apache datatracker configuration has been used together with a -datatracker checkout of trunk@ under /srv/www/ietfdb/ to run this on a development -server using mod_wsgi under apache. For a production server, additional access -restrictions are needed for the secretariat tools. - ----- -# This directive must be set globally, not inside : -WSGIPythonEggs /var/www/.python-eggs/ - - - ServerName tracker.tools.ietf.org - - ServerSignature Off - CustomLog /var/log/apache2/tracker.tools.ietf.org-access.log full - ErrorLog /var/log/apache2/tracker.tools.ietf.org-error.log - - DocumentRoot "/srv/www/ietfdb/static/" - - Alias /robots.tx /srv/www/ietfdb/static/dev/robots.txt - AliasMatch "^/((favicon.ico|images|css|js|media|secretariat)(.*))$" /srv/www/ietfdb/static/$1 - - WSGIScriptAlias / /srv/www/ietfdb/ietf/wsgi.py - - - AuthType Digest - AuthName "IETF" - AuthUserFile /var/local/loginmgr/digest - AuthGroupFile /var/local/loginmgr/groups - AuthDigestDomain http://tools.ietf.org/ - Require valid-user - - ----- - -""" - import os import sys