From fb9a387616ad4a64d5436699af1b0dbbd53c1571 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Tue, 27 Oct 2020 08:29:54 +0100
Subject: [PATCH] Remove alioth references

The alioth.debian.org service has been decommisioned. This commit
removes links to alioth and the alioth user name input field.

Fixes #1
---
 debianmemberportfolio/forms.py                    |  3 ---
 debianmemberportfolio/model/portfolio.ini         |  4 +---
 debianmemberportfolio/model/urlbuilder.py         |  1 -
 debianmemberportfolio/templates/showform.html     |  7 -------
 debianmemberportfolio/templates/showformscript.js | 10 +++-------
 debianmemberportfolio/views.py                    |  5 +----
 docs/source/devdocs.rst                           |  2 --
 7 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/debianmemberportfolio/forms.py b/debianmemberportfolio/forms.py
index a309dcd..2b2ae1c 100644
--- a/debianmemberportfolio/forms.py
+++ b/debianmemberportfolio/forms.py
@@ -59,9 +59,6 @@ class DeveloperData(FlaskForm):
     salsausername = StringField('salsausername', validators=[
         Optional(), PlainText()
     ])
-    aliothusername = StringField('aliothusername', validators=[
-        Optional(), PlainText()
-    ])
     mode = RadioField(
         'mode', default='html', choices=[
             ('json', _('JSON')), ('html', _('HTML'))
diff --git a/debianmemberportfolio/model/portfolio.ini b/debianmemberportfolio/model/portfolio.ini
index db43428..b4e30ad 100644
--- a/debianmemberportfolio/model/portfolio.ini
+++ b/debianmemberportfolio/model/portfolio.ini
@@ -69,7 +69,7 @@ people.pattern=https://people.debian.org/~%(username)s/
 people.optional=true
 
 [membership]
-urls=nm,dbfinger,db,webid,alioth,salsa,wiki,forum
+urls=nm,dbfinger,db,webid,salsa,wiki,forum
 nm.pattern=https://nm.debian.org/public/nmstatus/%(username)s
 dbfinger.pattern=finger %(username)s@db.debian.org
 dbfinger.type=finger
@@ -80,8 +80,6 @@ webid.pattern=http://webid.debian.net/maintainers/%(username)s
 webid.optional=true
 salsa.pattern=https://salsa.debian.org/%(salsausername)s
 salsa.optional=true
-alioth.pattern=https://alioth.debian.org/users/%(aliothusername)s/
-alioth.optional=true
 wiki.pattern=https://wiki.debian.org/%(wikihomepage)s
 forum.pattern=http://forums.debian.net/memberlist.php?mode=viewprofile&u=%(forumsid)s
 forum.optional=true
diff --git a/debianmemberportfolio/model/urlbuilder.py b/debianmemberportfolio/model/urlbuilder.py
index d107fc8..74a3a8d 100644
--- a/debianmemberportfolio/model/urlbuilder.py
+++ b/debianmemberportfolio/model/urlbuilder.py
@@ -46,7 +46,6 @@ _FIELDNAMES_MAP = {
     'username': N_('Debian user name'),
     'nonddemail': N_('Non Debian email address'),
     'salsausername': N_('Salsa user name'),
-    'aliothusername': N_('Alioth user name'),
 }
 
 
diff --git a/debianmemberportfolio/templates/showform.html b/debianmemberportfolio/templates/showform.html
index ccef9f2..1904881 100644
--- a/debianmemberportfolio/templates/showform.html
+++ b/debianmemberportfolio/templates/showform.html
@@ -74,13 +74,6 @@ with this program.  If not, see <https://www.gnu.org/licenses/>.
       </label><br />
       {{ form.salsausername }}
     </div>
-    <div id="aliothusernamefield"{% if form.aliothusername.errors %} class="witherrors"{% endif %}>
-      <label for="aliothusername">{{ _('Alioth user name:') }}{% if form.aliothusername.errors %}<br />
-        <span class="errormsg">{{ form.aliothusername.errors|join(', ') }}</span>
-        {% endif %}
-      </label><br />
-      {{ form.aliothusername }}
-    </div>
     <div id="wikihomepagefield"{% if form.wikihomepage.errors %} class="witherrors"{% endif %}>
       <label for="wikihomepage">{{ _('Wiki user name:') }}{% if form.wikihomepage.errors %}<br />
         <span class="errormsg">{{ form.wikihomepage.errors|join(', ') }}</span>
diff --git a/debianmemberportfolio/templates/showformscript.js b/debianmemberportfolio/templates/showformscript.js
index 6adc302..c70ed19 100644
--- a/debianmemberportfolio/templates/showformscript.js
+++ b/debianmemberportfolio/templates/showformscript.js
@@ -19,13 +19,13 @@ with this program.  If not, see <https://www.gnu.org/licenses/>.
 #}
 var defaulthiddendivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
-    '#salsausernamefield', '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
+    '#salsausernamefield', '#wikihomepagefield', '#forumsidfield');
 var maskedfielddivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
-    '#salsausernamefield', '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
+    '#salsausernamefield', '#wikihomepagefield', '#forumsidfield');
 var allfielddivs = new Array(
     '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
-    '#salsausernamefield', '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield');
+    '#salsausernamefield', '#wikihomepagefield', '#forumsidfield');
 
 function updateFields(data, textStatus) {
     if (data.type == 2) { // DD
@@ -35,7 +35,6 @@ function updateFields(data, textStatus) {
             'readonly', 'readonly');
         $('#nonddemail').prop('value', data.email).focus();
         $('#salsausername').prop('value', data.username);
-        $('#aliothusername').prop('value', data.username);
         $('#wikihomepage').prop('value', data.wikihomepage);
 
         $('#namefield').show();
@@ -43,7 +42,6 @@ function updateFields(data, textStatus) {
         $('#usernamefield').show();
         $('#nonddemailfield').show();
         $('#salsausernamefield').show();
-        $('#aliothusernamefield').show();
         $('#wikihomepagefield').show();
         $('#forumsidfield').show();
 
@@ -60,7 +58,6 @@ function updateFields(data, textStatus) {
         $('#usernamefield').hide();
         $('#nonddemailfield').hide();
         $('#salsausernamefield').show();
-        $('#aliothusernamefield').show();
         $('#wikihomepagefield').show();
         $('#forumsidfield').show();
 
@@ -76,7 +73,6 @@ function updateFields(data, textStatus) {
         $('#nonddemailfield').hide();
         $('#namefield').show();
         $('#salsausernamefield').show();
-        $('#aliothusernamefield').show();
         $('#wikihomepagefield').show();
         $('#forumsidfield').show();
 
diff --git a/debianmemberportfolio/views.py b/debianmemberportfolio/views.py
index b4368cb..28aed4a 100644
--- a/debianmemberportfolio/views.py
+++ b/debianmemberportfolio/views.py
@@ -81,7 +81,6 @@ developer name on all bug logs)'),
         'label': N_('Files'),
         'people': N_('people.d.o'),
         'oldpeople': N_('oldpeople'),
-        'alioth': N_('Alioth'),
     },
     'membership': {
         'label': N_('Membership'),
@@ -90,7 +89,6 @@ developer name on all bug logs)'),
         'db': N_('DB information via HTTP'),
         'webid': N_('FOAF profile'),
         'salsa': N_('Salsa'),
-        'alioth': N_('Alioth'),
         'wiki': N_('Wiki'),
         'forum': N_('Forum'),
     },
@@ -128,8 +126,7 @@ DM_TUPLES = (('name', 'name'),
 
 #: list of field name tuples for Debian Developers
 DD_TUPLES = (('username', 'username'),
-             ('salsausername', 'username'),
-             ('aliothusername', 'username'))
+             ('salsausername', 'username'))
 
 
 def _get_label(section, url=None):
diff --git a/docs/source/devdocs.rst b/docs/source/devdocs.rst
index cb5a515..01b77ba 100644
--- a/docs/source/devdocs.rst
+++ b/docs/source/devdocs.rst
@@ -133,7 +133,6 @@ that are filled at runtime:
 Placeholder        Replacement
 ================== ========================================
 %(salsausername)s  user name on `salsa.debian.org`_
-%(aliothusername)s user name on `alioth.debian.org`_
 %(email)s          email address (URL encoded)
 %(emailnoq)s       email address
 %(firstchar)s      first character of the email address
@@ -145,7 +144,6 @@ Placeholder        Replacement
 ================== ========================================
 
 .. _salsa.debian.org: https://salsa.debian.org/
-.. _alioth.debian.org: https://alioth.debian.org/
 
 The replacement of placeholders is performed in the
 :py:func:`~debianmemberportfolio.views.urllist` function. And uses data from