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

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.

Browse source 
- Legacy-Id: 19422
This commit is contained in:
Robert Sparks 2021-10-13 21:43:44 +00:00
parent 21f5a55e2f
commit cd748cd760
13 changed files with 40 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/doc/templatetags/ballot_icon.py
View file

@ -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 <pasi.eronen@nokia.com>
#
@ -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

5
ietf/group/models.py
View file

@ -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'''

5
ietf/group/utils.py
View file

@ -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 &raquo;"), group.list_archive))
if group.has_tools_page():
entries.append((mark_safe("Tools &raquo;"), "https://tools.ietf.org/%s/%s/" % (group.type_id, group.acronym)))
# actions
actions = []

4
ietf/meeting/management/commands/create_dummy_meeting.py
View file

@ -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.

4
ietf/meeting/management/commands/generate_schedule.py
View file

@ -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

4
ietf/redirects/views.py
View file

@ -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')

4
ietf/review/policies.py
View file

@ -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.
"""

4
ietf/review/tests_policies.py
View file

@ -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')

3
ietf/templates/base.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html> {% 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 %}
<html lang="en">
@ -129,7 +129,6 @@
<a href="https://www.iab.org/" class="padded">IAB</a>
<a href="https://www.iana.org/" class="padded">IANA</a>
<a href="https://www.ietf.org/privacy-statement/" class="padded">Privacy&nbsp;Statement</a>
<a href="https://tools.ietf.org/" class="padded">IETF&nbsp;Tools</a>
</div>
</div>

4
ietf/templates/group/concluded_groups.html
View file

@ -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 @@
<div class="panel-body">
{% if label == "WGs" %}
{% comment "Replace this if that tools page is moved" %}
<p>
Some additional concluded WGs may
be present <a href="https://tools.ietf.org/wg/concluded">here</a>.
</p>
{% endcomment %}
{% elif label == "RGs" %}
<p>
The information below is incomplete and misses a few older RGs.

15
ietf/templates/meeting/agenda.html
View file

@ -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 @@
</span>
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
{% if schedule.meeting.number|add:"0" < 96 %}
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{{item.timeslot.get_html_location}}</a>
{% comment %}<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %}
{{item.timeslot.get_html_location}}
}
{% comment %}</a>{% endcomment %}
{% elif item.timeslot.location.floorplan %}
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}?room={{ item.timeslot.get_html_location|xslugify }}">{{item.timeslot.get_html_location}}</a>
{% else %}
@ -248,7 +251,9 @@
</span>
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
{% if schedule.meeting.number|add:"0" < 96 %}
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{{item.timeslot.get_html_location}}</a>
{% comment %}<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %}
{{item.timeslot.get_html_location}}
{% comment %}</a>{% endcomment %}
{% elif item.timeslot.location.floorplan %}
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}?room={{ item.timeslot.get_html_location|xslugify }}">{{item.timeslot.get_html_location}}</a>
{% else %}
@ -271,7 +276,9 @@
<td>
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
{% if schedule.meeting.number|add:"0" < 96 %}
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{{item.timeslot.get_html_location}}</a>
{% comment %}<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %}
{{item.timeslot.get_html_location}}
{% comment %}</a>{% endcomment %}
{% elif item.timeslot.location.floorplan %}
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}?room={{ item.timeslot.get_html_location|xslugify }}">{{item.timeslot.get_html_location}}</a>
{% else %}

15
ietf/templates/meeting/agenda_personalize.html
View file

@ -160,8 +160,9 @@
</span>
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
{% if schedule.meeting.number|add:"0" < 96 %}
<a
href="https://tools.ietf.org/agenda/{{ schedule.meeting.number }}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{{ item.timeslot.get_html_location }}</a>
{% comment %}<a href="https://tools.ietf.org/agenda/{{ schedule.meeting.number }}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment $}
{{ item.timeslot.get_html_location }}
{% comment %}</a>{% endcomment %}
{% elif item.timeslot.location.floorplan %}
<a
href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}?room={{ item.timeslot.get_html_location|xslugify }}">{{ item.timeslot.get_html_location }}</a>
@ -227,8 +228,9 @@
</span>
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
{% if schedule.meeting.number|add:"0" < 96 %}
<a
href="https://tools.ietf.org/agenda/{{ schedule.meeting.number }}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{{ item.timeslot.get_html_location }}</a>
{% comment %}<a href="https://tools.ietf.org/agenda/{{ schedule.meeting.number }}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %}
{{ item.timeslot.get_html_location }}
{% comment %}</a>{% endcomment %}
{% elif item.timeslot.location.floorplan %}
<a
href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}?room={{ item.timeslot.get_html_location|xslugify }}">{{ item.timeslot.get_html_location }}</a>
@ -254,8 +256,9 @@
<td>
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
{% if schedule.meeting.number|add:"0" < 96 %}
<a
href="https://tools.ietf.org/agenda/{{ schedule.meeting.number }}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{{ item.timeslot.get_html_location }}</a>
{% comment %}<a href="https://tools.ietf.org/agenda/{{ schedule.meeting.number }}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %}
{{ item.timeslot.get_html_location }}
{% comment %}</a>{% endcomment %}
{% elif item.timeslot.location.floorplan %}
<a
href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}?room={{ item.timeslot.get_html_location|xslugify }}">{{ item.timeslot.get_html_location }}</a>

41
ietf/wsgi.py
View file

@ -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 <Virtualhost/>:
WSGIPythonEggs /var/www/.python-eggs/
<VirtualHost *:80>
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
<Location "/accounts/login">
AuthType Digest
AuthName "IETF"
AuthUserFile /var/local/loginmgr/digest
AuthGroupFile /var/local/loginmgr/groups
AuthDigestDomain http://tools.ietf.org/
Require valid-user
</Location>
</VirtualHost>
----
"""
import os
import sys