Chris Johnston has proposed merging
lp:~chrisjohnston/loco-directory/display_name into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-directory/display_name/+merge/68583
--
https://code.launchpad.net/~chrisjohnston/loco-directory/display_name/+merge/68583
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/display_name into lp:loco-directory.
=== modified file 'loco_directory/teams/forms.py'
--- loco_directory/teams/forms.py 2011-01-05 13:06:15 +0000
+++ loco_directory/teams/forms.py 2011-07-20 17:42:29 +0000
@@ -10,7 +10,7 @@
class UpdateTeamForm(forms.ModelForm, RenderableMixin):
class Meta:
model = Team
- exclude = ('approved_date', 'approved', 'expires_date', 'name', 'lp_name', 'admins', 'owner', 'active')
+ exclude = ('approved_date', 'approved', 'expires_date', 'name', 'lp_name', 'admins', 'owner', 'active', 'override_name')
class Media:
css = {'all': (
@@ -41,6 +41,4 @@
class LoCoCouncilForm(UpdateTeamForm, RenderableMixin):
class Meta(UpdateTeamForm.Meta):
model = Team
- exclude = ('approved', 'expires_date', 'name', 'lp_name', 'admins', 'owner', 'active')
-
-
+ exclude = ('approved', 'expires_date', 'name', 'lp_name', 'admins', 'owner', 'active', 'override_name')
=== added file 'loco_directory/teams/migrations/0014_add_display_name.py'
--- loco_directory/teams/migrations/0014_add_display_name.py 1970-01-01 00:00:00 +0000
+++ loco_directory/teams/migrations/0014_add_display_name.py 2011-07-20 17:42:29 +0000
@@ -0,0 +1,125 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Adding field 'Team.override_name'
+ db.add_column('teams', 'override_name', self.gf('django.db.models.fields.CharField')(max_length=80, null=True, blank=True), keep_default=False)
+
+
+ def backwards(self, orm):
+
+ # Deleting field 'Team.override_name'
+ db.delete_column('teams', 'override_name')
+
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'teams.continent': {
+ 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+ },
+ 'teams.country': {
+ 'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
+ 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+ },
+ 'teams.language': {
+ 'Meta': {'ordering': "('name',)", 'object_name': 'Language'},
+ 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
+ },
+ 'teams.team': {
+ 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+ 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+ 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+ 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+ 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+ 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
+ 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
+ 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
+ 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
+ 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+ 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+ 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+ 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+ 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ },
+ 'userprofiles.userprofile': {
+ 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
+ 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+ 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+ 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+ 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+ 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+ 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+ 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
+ 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+ 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+ 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
+ }
+ }
+
+ complete_apps = ['teams']
=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py 2011-07-04 01:15:21 +0000
+++ loco_directory/teams/models.py 2011-07-20 17:42:29 +0000
@@ -84,6 +84,7 @@
class Team(models.Model, LocalTimeMixin):
lp_name = models.CharField(_("Launchpad Team ID"), max_length=40, null=True)
name = models.CharField(_("Team Name"), max_length=80, null=True)
+ override_name = models.CharField(_("Override Imported Team Name"), max_length=80, null=True, blank=True)
countries = models.ManyToManyField(Country)
spr = models.CharField(_("State/Province/Region"), max_length=50, null=True, blank=True)
city = models.CharField(_("City"), max_length=50, null=True, blank=True)
@@ -125,6 +126,10 @@
def __unicode__(self):
return self.lp_name
+ @property
+ def display_name(self):
+ return self.override_name or self.name
+
@models.permalink
def get_absolute_url(self):
return ('team-detail', [str(self.lp_name)])
=== modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html'
--- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-12-25 03:39:17 +0000
+++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2011-07-20 17:42:29 +0000
@@ -7,7 +7,7 @@
<ul>
{% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
<li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}">
- <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a> - {{ team_event.local_date_begin|date:"D, d N" }}{% endfor %}
+ <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.display_name }}</a> - {{ team_event.local_date_begin|date:"D, d N" }}{% endfor %}
</li>
{% endifequal %}{% endfor %}
</ul>
@@ -22,7 +22,7 @@
<ul>
{% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
<li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}</li>">
- <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a> - {{ team_event.local_date_begin|date:"D, d N" }}{% endfor %}
+ <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.display_name }}</a> - {{ team_event.local_date_begin|date:"D, d N" }}{% endfor %}
</li>
{% endifequal %}{% endfor %}
</ul>
@@ -35,7 +35,7 @@
<ul>
{% for team_event in events_without_venue %}
<li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}">
- <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a> - {{ team_event.local_date_begin|date:"D, d N" }}{% endfor %}
+ <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>{% for team in team_event.teams.all %}{% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %} - <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.display_name }}</a> - {{ team_event.local_date_begin|date:"D, d N" }}{% endfor %}
</li>
{% endfor %}
</ul>
=== modified file 'loco_directory/templates/events/team_event_list.inc.html'
--- loco_directory/templates/events/team_event_list.inc.html 2011-04-07 13:10:41 +0000
+++ loco_directory/templates/events/team_event_list.inc.html 2011-07-20 17:42:29 +0000
@@ -19,7 +19,7 @@
</td>
<td class="event_teams no-wrap">
{% for team in team_event.teams.all %}
- <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>
+ <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.display_name }}</a>
{% if not forloop.last %}
<br/>
{% endif %}
=== modified file 'loco_directory/templates/meetings/team_meeting_list.inc.html'
--- loco_directory/templates/meetings/team_meeting_list.inc.html 2011-06-17 17:10:41 +0000
+++ loco_directory/templates/meetings/team_meeting_list.inc.html 2011-07-20 17:42:29 +0000
@@ -18,7 +18,7 @@
</td>
<td class="meeting_teams no-wrap">
{% for team in team_meeting.teams.all %}
- <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>
+ <a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.display_name }}</a>
{% if not forloop.last %}
<br/>
{% endif %}
=== modified file 'loco_directory/templates/teams/team_list.html'
--- loco_directory/templates/teams/team_list.html 2011-07-18 01:14:26 +0000
+++ loco_directory/templates/teams/team_list.html 2011-07-20 17:42:29 +0000
@@ -25,7 +25,7 @@
<ul>
{{colcycle.reset}}
{% for team in continent.related_teams %}
- <li title="{% if team.approved %}{% blocktrans with team.name as teamname %}{{ teamname }} approved{% endblocktrans %}{% else %}{% blocktrans with team.name as teamname %}{{ teamname }} not approved{% endblocktrans %}{% endif %}" class="{% if team.approved %}approved{% else %}unapproved{% endif %} {{colcycle.next}}"><a href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>
+ <li title="{% if team.approved %}{% blocktrans with team.display_name as teamname %}{{ teamname }} approved{% endblocktrans %}{% else %}{% blocktrans with team.display_name as teamname %}{{ teamname }} not approved{% endblocktrans %}{% endif %}" class="{% if team.approved %}approved{% else %}unapproved{% endif %} {{colcycle.next}}"><a href="{{ team.get_absolute_url }}">{{ team.display_name }}</a></li>
{% endfor %}
</ul>
</article>
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
