Kaynağa Gözat

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
tags/0.6.4^2
Jan Dittberner 4 ay önce
ebeveyn
işleme
fb9a387616
7 değiştirilmiş dosya ile 5 ekleme ve 27 silme
  1. +0
    -3
      debianmemberportfolio/forms.py
  2. +1
    -3
      debianmemberportfolio/model/portfolio.ini
  3. +0
    -1
      debianmemberportfolio/model/urlbuilder.py
  4. +0
    -7
      debianmemberportfolio/templates/showform.html
  5. +3
    -7
      debianmemberportfolio/templates/showformscript.js
  6. +1
    -4
      debianmemberportfolio/views.py
  7. +0
    -2
      docs/source/devdocs.rst

+ 0
- 3
debianmemberportfolio/forms.py Dosyayı Görüntüle

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


+ 1
- 3
debianmemberportfolio/model/portfolio.ini Dosyayı Görüntüle

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


+ 0
- 1
debianmemberportfolio/model/urlbuilder.py Dosyayı Görüntüle

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




+ 0
- 7
debianmemberportfolio/templates/showform.html Dosyayı Görüntüle

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


+ 3
- 7
debianmemberportfolio/templates/showformscript.js Dosyayı Görüntüle

@@ -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();



+ 1
- 4
debianmemberportfolio/views.py Dosyayı Görüntüle

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


+ 0
- 2
docs/source/devdocs.rst Dosyayı Görüntüle

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


Yükleniyor…
İptal
Kaydet