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
This commit is contained in:
Jan Dittberner 2020-10-27 08:29:54 +01:00
parent 5e213917b7
commit fb9a387616
7 changed files with 5 additions and 27 deletions

View file

@ -59,9 +59,6 @@ class DeveloperData(FlaskForm):
salsausername = StringField('salsausername', validators=[ salsausername = StringField('salsausername', validators=[
Optional(), PlainText() Optional(), PlainText()
]) ])
aliothusername = StringField('aliothusername', validators=[
Optional(), PlainText()
])
mode = RadioField( mode = RadioField(
'mode', default='html', choices=[ 'mode', default='html', choices=[
('json', _('JSON')), ('html', _('HTML')) ('json', _('JSON')), ('html', _('HTML'))

View file

@ -69,7 +69,7 @@ people.pattern=https://people.debian.org/~%(username)s/
people.optional=true people.optional=true
[membership] [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 nm.pattern=https://nm.debian.org/public/nmstatus/%(username)s
dbfinger.pattern=finger %(username)s@db.debian.org dbfinger.pattern=finger %(username)s@db.debian.org
dbfinger.type=finger dbfinger.type=finger
@ -80,8 +80,6 @@ webid.pattern=http://webid.debian.net/maintainers/%(username)s
webid.optional=true webid.optional=true
salsa.pattern=https://salsa.debian.org/%(salsausername)s salsa.pattern=https://salsa.debian.org/%(salsausername)s
salsa.optional=true salsa.optional=true
alioth.pattern=https://alioth.debian.org/users/%(aliothusername)s/
alioth.optional=true
wiki.pattern=https://wiki.debian.org/%(wikihomepage)s wiki.pattern=https://wiki.debian.org/%(wikihomepage)s
forum.pattern=http://forums.debian.net/memberlist.php?mode=viewprofile&u=%(forumsid)s forum.pattern=http://forums.debian.net/memberlist.php?mode=viewprofile&u=%(forumsid)s
forum.optional=true forum.optional=true

View file

@ -46,7 +46,6 @@ _FIELDNAMES_MAP = {
'username': N_('Debian user name'), 'username': N_('Debian user name'),
'nonddemail': N_('Non Debian email address'), 'nonddemail': N_('Non Debian email address'),
'salsausername': N_('Salsa user name'), 'salsausername': N_('Salsa user name'),
'aliothusername': N_('Alioth user name'),
} }

View file

@ -74,13 +74,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>.
</label><br /> </label><br />
{{ form.salsausername }} {{ form.salsausername }}
</div> </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 %}> <div id="wikihomepagefield"{% if form.wikihomepage.errors %} class="witherrors"{% endif %}>
<label for="wikihomepage">{{ _('Wiki user name:') }}{% if form.wikihomepage.errors %}<br /> <label for="wikihomepage">{{ _('Wiki user name:') }}{% if form.wikihomepage.errors %}<br />
<span class="errormsg">{{ form.wikihomepage.errors|join(', ') }}</span> <span class="errormsg">{{ form.wikihomepage.errors|join(', ') }}</span>

View file

@ -19,13 +19,13 @@ with this program. If not, see <https://www.gnu.org/licenses/>.
#} #}
var defaulthiddendivs = new Array( var defaulthiddendivs = new Array(
'#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield', '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
'#salsausernamefield', '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield'); '#salsausernamefield', '#wikihomepagefield', '#forumsidfield');
var maskedfielddivs = new Array( var maskedfielddivs = new Array(
'#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield', '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
'#salsausernamefield', '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield'); '#salsausernamefield', '#wikihomepagefield', '#forumsidfield');
var allfielddivs = new Array( var allfielddivs = new Array(
'#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield', '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield',
'#salsausernamefield', '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield'); '#salsausernamefield', '#wikihomepagefield', '#forumsidfield');
function updateFields(data, textStatus) { function updateFields(data, textStatus) {
if (data.type == 2) { // DD if (data.type == 2) { // DD
@ -35,7 +35,6 @@ function updateFields(data, textStatus) {
'readonly', 'readonly'); 'readonly', 'readonly');
$('#nonddemail').prop('value', data.email).focus(); $('#nonddemail').prop('value', data.email).focus();
$('#salsausername').prop('value', data.username); $('#salsausername').prop('value', data.username);
$('#aliothusername').prop('value', data.username);
$('#wikihomepage').prop('value', data.wikihomepage); $('#wikihomepage').prop('value', data.wikihomepage);
$('#namefield').show(); $('#namefield').show();
@ -43,7 +42,6 @@ function updateFields(data, textStatus) {
$('#usernamefield').show(); $('#usernamefield').show();
$('#nonddemailfield').show(); $('#nonddemailfield').show();
$('#salsausernamefield').show(); $('#salsausernamefield').show();
$('#aliothusernamefield').show();
$('#wikihomepagefield').show(); $('#wikihomepagefield').show();
$('#forumsidfield').show(); $('#forumsidfield').show();
@ -60,7 +58,6 @@ function updateFields(data, textStatus) {
$('#usernamefield').hide(); $('#usernamefield').hide();
$('#nonddemailfield').hide(); $('#nonddemailfield').hide();
$('#salsausernamefield').show(); $('#salsausernamefield').show();
$('#aliothusernamefield').show();
$('#wikihomepagefield').show(); $('#wikihomepagefield').show();
$('#forumsidfield').show(); $('#forumsidfield').show();
@ -76,7 +73,6 @@ function updateFields(data, textStatus) {
$('#nonddemailfield').hide(); $('#nonddemailfield').hide();
$('#namefield').show(); $('#namefield').show();
$('#salsausernamefield').show(); $('#salsausernamefield').show();
$('#aliothusernamefield').show();
$('#wikihomepagefield').show(); $('#wikihomepagefield').show();
$('#forumsidfield').show(); $('#forumsidfield').show();

View file

@ -81,7 +81,6 @@ developer name on all bug logs)'),
'label': N_('Files'), 'label': N_('Files'),
'people': N_('people.d.o'), 'people': N_('people.d.o'),
'oldpeople': N_('oldpeople'), 'oldpeople': N_('oldpeople'),
'alioth': N_('Alioth'),
}, },
'membership': { 'membership': {
'label': N_('Membership'), 'label': N_('Membership'),
@ -90,7 +89,6 @@ developer name on all bug logs)'),
'db': N_('DB information via HTTP'), 'db': N_('DB information via HTTP'),
'webid': N_('FOAF profile'), 'webid': N_('FOAF profile'),
'salsa': N_('Salsa'), 'salsa': N_('Salsa'),
'alioth': N_('Alioth'),
'wiki': N_('Wiki'), 'wiki': N_('Wiki'),
'forum': N_('Forum'), 'forum': N_('Forum'),
}, },
@ -128,8 +126,7 @@ DM_TUPLES = (('name', 'name'),
#: list of field name tuples for Debian Developers #: list of field name tuples for Debian Developers
DD_TUPLES = (('username', 'username'), DD_TUPLES = (('username', 'username'),
('salsausername', 'username'), ('salsausername', 'username'))
('aliothusername', 'username'))
def _get_label(section, url=None): def _get_label(section, url=None):

View file

@ -133,7 +133,6 @@ that are filled at runtime:
Placeholder Replacement Placeholder Replacement
================== ======================================== ================== ========================================
%(salsausername)s user name on `salsa.debian.org`_ %(salsausername)s user name on `salsa.debian.org`_
%(aliothusername)s user name on `alioth.debian.org`_
%(email)s email address (URL encoded) %(email)s email address (URL encoded)
%(emailnoq)s email address %(emailnoq)s email address
%(firstchar)s first character of the email address %(firstchar)s first character of the email address
@ -145,7 +144,6 @@ Placeholder Replacement
================== ======================================== ================== ========================================
.. _salsa.debian.org: https://salsa.debian.org/ .. _salsa.debian.org: https://salsa.debian.org/
.. _alioth.debian.org: https://alioth.debian.org/
The replacement of placeholders is performed in the The replacement of placeholders is performed in the
:py:func:`~debianmemberportfolio.views.urllist` function. And uses data from :py:func:`~debianmemberportfolio.views.urllist` function. And uses data from