Skip to content

Commit cd748cd

Browse files
rjsparksrjsparks
committed
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
1 parent 21f5a55 commit cd748cd

File tree

13 files changed

+40
-72
lines changed

13 files changed

+40
-72
lines changed

‎ietf/doc/templatetags/ballot_icon.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2012-2020, All Rights Reserved
1+
# Copyright The IETF Trust 2012-2021, All Rights Reserved
22
# Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
33
# All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
44
#
@@ -181,7 +181,7 @@ def state_age_colored(doc):
181181
state_date = datetime.date(1990,1,1)
182182
days = (datetime.date.today() - state_date).days
183183
# loosely based on
184-
# http://trac.tools.ietf.org/group/iesg/trac/wiki/PublishPath
184+
# https://trac.ietf.org/trac/iesg/wiki/PublishPath
185185
if iesg_state == "lc":
186186
goal1 = 30
187187
goal2 = 30

‎ietf/group/models.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2010-2020, All Rights Reserved
1+
# Copyright The IETF Trust 2010-2021, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

44

@@ -190,9 +190,6 @@ def json_dict(self, host_scheme):
190190
group1['comments'] = self.comments
191191
return group1
192192

193-
def has_tools_page(self):
194-
return self.type_id in ['wg', ] and self.state_id in ['active', 'dormant', 'replaced', 'conclude']
195-
196193
def liaison_approvers(self):
197194
'''Returns roles that have liaison statement approval authority for group'''
198195

‎ietf/group/utils.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2012-2020, All Rights Reserved
1+
# Copyright The IETF Trust 2012-2021, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

44

@@ -208,8 +208,7 @@ def construct_group_menu_context(request, group, selected, group_type, others):
208208
entries.append(("Email expansions", urlreverse("ietf.group.views.email", kwargs=kwargs)))
209209
if group.list_archive.startswith("http:") or group.list_archive.startswith("https:") or group.list_archive.startswith("ftp:"):
210210
entries.append((mark_safe("List archive &raquo;"), group.list_archive))
211-
if group.has_tools_page():
212-
entries.append((mark_safe("Tools &raquo;"), "https://tools.ietf.org/%s/%s/" % (group.type_id, group.acronym)))
211+
213212

214213
# actions
215214
actions = []

‎ietf/meeting/management/commands/create_dummy_meeting.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2020, All Rights Reserved
1+
# Copyright The IETF Trust 2020-2021, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

44
# This command generates a Meeting (IETF 999) with Rooms, TimeSlots, Sessions and Constraints.
@@ -14,7 +14,7 @@
1414
# can be translated to the newly expanded Constraint objects.
1515
#
1616
# This work was done in the context of the new meeting constraints modelling:
17-
# https://trac.tools.ietf.org/tools/ietfdb/wiki/MeetingConstraints
17+
# https://trac.ietf.org/trac/ietfdb/wiki/MeetingConstraints
1818
# Note that aside from Constraint objects, as created below, there is also
1919
# business logic that applies to all sessions, which is to be implemented
2020
# in the automatic schedule builder.

‎ietf/meeting/management/commands/generate_schedule.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Copyright The IETF Trust 2020, All Rights Reserved
1+
# Copyright The IETF Trust 2021, All Rights Reserved
22
# For an overview of this process and context, see:
3-
# https://trac.tools.ietf.org/tools/ietfdb/wiki/MeetingConstraints
3+
# https://trac.ietf.org/trac/ietfdb/wiki/MeetingConstraints
44
from __future__ import absolute_import, print_function, unicode_literals
55

66
import calendar

‎ietf/redirects/views.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2007-2020, All Rights Reserved
1+
# Copyright The IETF Trust 2007-2021, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

44

@@ -48,7 +48,7 @@ def redirect(request, path="", script=""):
4848
pass # it's ok, request didn't have 'command'.
4949
except:
5050
pass # strange exception like the one described in
51-
# http://merlot.tools.ietf.org/tools/ietfdb/ticket/179 ?
51+
# https://trac.ietf.org/trac/ietfdb/ticket/179?
5252
# just ignore the command string.
5353
if cmd is not None:
5454
remove_args.append('command')

‎ietf/review/policies.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2019-2020, All Rights Reserved
1+
# Copyright The IETF Trust 2019-2021, All Rights Reserved
22

33

44
import re
@@ -23,7 +23,7 @@
2323
"""
2424
This file contains policies regarding reviewer queues.
2525
The policies are documented in more detail on:
26-
https://trac.tools.ietf.org/tools/ietfdb/wiki/ReviewerQueuePolicy
26+
https://trac.ietf.org/trac/ietfdb/wiki/ReviewerQueuePolicy
2727
Terminology used here should match terminology used in that document.
2828
"""
2929

‎ietf/review/tests_policies.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2016-2019, All Rights Reserved
1+
# Copyright The IETF Trust 2016-2021, All Rights Reserved
22

33
import debug # pyflakes:ignore
44
import datetime
@@ -834,7 +834,7 @@ def test_determine_ranking(self):
834834
self.assertEqual(len(ranking), 2)
835835
self.assertEqual(ranking[0]['email'], reviewer_high.email())
836836
self.assertEqual(ranking[1]['email'], reviewer_low.email())
837-
# These scores follow the ordering of https://trac.tools.ietf.org/tools/ietfdb/wiki/ReviewerQueuePolicy,
837+
# These scores follow the ordering of https://trac.ietf.org/trac/ietfdb/wiki/ReviewerQueuePolicy,
838838
self.assertEqual(ranking[0]['scores'], [ 1, 1, 1, 1, 1, 1, 0, 0, -1])
839839
self.assertEqual(ranking[1]['scores'], [-1, -1, -1, -1, -1, -1, -91, -2, 0])
840840
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')

‎ietf/templates/base.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html> {% load ietf_filters static %}
2-
{# Copyright The IETF Trust 2015, All Rights Reserved #}
2+
{# Copyright The IETF Trust 2015-2021, All Rights Reserved #}
33
{% load origin %}{% origin %}
44
{% load bootstrap3 %}
55
<html lang="en">
@@ -129,7 +129,6 @@
129129
<a href="https://www.iab.org/" class="padded">IAB</a>
130130
<a href="https://www.iana.org/" class="padded">IANA</a>
131131
<a href="https://www.ietf.org/privacy-statement/" class="padded">Privacy&nbsp;Statement</a>
132-
<a href="https://tools.ietf.org/" class="padded">IETF&nbsp;Tools</a>
133132
</div>
134133
</div>
135134

‎ietf/templates/group/concluded_groups.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "base.html" %}
2-
{# Copyright The IETF Trust 2015, All Rights Reserved #}
2+
{# Copyright The IETF Trust 2015-2021, All Rights Reserved #}
33
{% load origin static %}
44

55
{% block pagehead %}
@@ -36,10 +36,12 @@ <h1>Concluded groups</h1>
3636
<div class="panel-body">
3737

3838
{% if label == "WGs" %}
39+
{% comment "Replace this if that tools page is moved" %}
3940
<p>
4041
Some additional concluded WGs may
4142
be present <a href="https://tools.ietf.org/wg/concluded">here</a>.
4243
</p>
44+
{% endcomment %}
4345
{% elif label == "RGs" %}
4446
<p>
4547
The information below is incomplete and misses a few older RGs.

0 commit comments

Comments
 (0)