Skip to content
This repository was archived by the owner on Jun 9, 2020. It is now read-only.

Commit 983f0c5

Browse files
committed
adiciona a pagina principal um grupo aletorio de membros
1 parent 13cd26c commit 983f0c5

6 files changed

Lines changed: 37 additions & 68 deletions

File tree

core/context_processors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.contrib.auth.models import User
1+
from meetup.models import Member
22
from twitter_app.models import Tweet
33

44

@@ -10,5 +10,5 @@ def tweets(request):
1010

1111
def members(request):
1212
return {
13-
'members': User.objects.filter(is_superuser=False).order_by('?')[:12]
13+
'members': Member.objects.order_by('?')[:12]
1414
}

data/feeds.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"pk": 1, "model": "feeds.feed", "fields": {"public_url": "http://www.meetup.com/Belo-Horizonte-Python-User-Group/", "feed_url": "http://www.meetup.com/Belo-Horizonte-Python-User-Group/events/rss/", "title": "Meetup"}}, {"pk": 2, "model": "feeds.feed", "fields": {"public_url": "https://github.com/python-mg/python-mg/", "feed_url": "https://github.com/python-mg/python-mg/commits/master.atom", "title": "Github"}}, {"pk": 3, "model": "feeds.feed", "fields": {"public_url": "https://groups.google.com/forum/feed/python-mg/msgs/", "feed_url": "https://groups.google.com/forum/feed/python-mg/msgs/rss_v2_0.xml?num=50", "title": "Google Groups"}}]
1+
[{"pk": 1, "model": "feeds.feed", "fields": {"public_url": "http://www.meetup.com/Belo-Horizonte-Python-User-Group/", "feed_url": "http://www.meetup.com/Belo-Horizonte-Python-User-Group/events/rss/", "title": "Meetup"}}, {"pk": 2, "model": "feeds.feed", "fields": {"public_url": "https://groups.google.com/forum/feed/python-mg/msgs/", "feed_url": "https://groups.google.com/forum/feed/python-mg/msgs/rss_v2_0.xml?num=50", "title": "Google Groups"}}]

meetup/migrations/0001_initial.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ def forwards(self, orm):
1313
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
1414
('guid', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)),
1515
('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
16-
('photo', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['meetup.Photo'], unique=True, null=True)),
1716
('link', self.gf('django.db.models.fields.URLField')(max_length=200)),
1817
))
1918
db.send_create_signal(u'meetup', ['Member'])
@@ -30,7 +29,7 @@ def forwards(self, orm):
3029
# Adding model 'Photo'
3130
db.create_table(u'meetup_photo', (
3231
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
33-
('guid', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)),
32+
('member', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['meetup.Member'], unique=True)),
3433
('photo_link', self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True)),
3534
('highres_link', self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True)),
3635
('thumb_link', self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True)),
@@ -55,14 +54,13 @@ def backwards(self, orm):
5554
'guid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
5655
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
5756
'link': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
58-
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
59-
'photo': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['meetup.Photo']", 'unique': 'True', 'null': 'True'})
57+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
6058
},
6159
u'meetup.photo': {
6260
'Meta': {'object_name': 'Photo'},
63-
'guid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
6461
'highres_link': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
6562
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
63+
'member': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['meetup.Member']", 'unique': 'True'}),
6664
'photo_link': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
6765
'thumb_link': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
6866
},

meetup/migrations/0002_auto__del_field_photo_guid.py

Lines changed: 0 additions & 47 deletions
This file was deleted.

meetup/models.py

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ def create_or_update(self, meetup_member):
1616

1717
member.save()
1818

19-
if member.photo and meetup_member.photo:
20-
member.photo.delete()
21-
elif not member.photo and meetup_member.photo:
22-
member.photo = Photo()
23-
19+
try:
20+
photo = Photo.objects.get(member=member)
21+
except Photo.DoesNotExist:
22+
photo = Photo()
23+
photo.member = member
2424
if meetup_member.photo:
25-
member.photo.photo_link = meetup_member.photo.photo_link
26-
member.photo.highres_link = meetup_member.photo.highres_link
27-
member.photo.thumb_link = meetup_member.photo.thumb_link
28-
member.photo.save()
25+
photo.photo_link = meetup_member.photo.photo_link
26+
photo.highres_link = meetup_member.photo.highres_link
27+
photo.thumb_link = meetup_member.photo.thumb_link
28+
photo.save()
2929

3030
for meetup_social in meetup_member.social:
3131
try:
@@ -43,14 +43,26 @@ def create_or_update(self, meetup_member):
4343
class Member(models.Model):
4444
guid = models.CharField(max_length=255, unique=True)
4545
name = models.CharField(max_length=255)
46-
photo = models.OneToOneField('meetup.Photo', null=True)
4746
link = models.URLField()
4847

4948
objects = MemberManager()
5049

5150
def __unicode__(self):
5251
return self.name
5352

53+
def photo_profile(self):
54+
try:
55+
photo = Photo.objects.get(member=self)
56+
if photo.thumb_link:
57+
return photo.thumb_link
58+
elif photo.highres_link:
59+
return photo.highres_link
60+
elif photo.photo_link:
61+
return photo.photo_link
62+
except Photo.DoesNotExist:
63+
pass
64+
return 'http://default_link'
65+
5466

5567
class Social(models.Model):
5668
member = models.ForeignKey('meetup.Member', related_name='other_services')
@@ -62,9 +74,10 @@ def __unicode__(self):
6274

6375

6476
class Photo(models.Model):
77+
member = models.OneToOneField('meetup.Member')
6578
photo_link = models.URLField(blank=True, null=True)
6679
highres_link = models.URLField(blank=True, null=True)
6780
thumb_link = models.URLField(blank=True, null=True)
6881

6982
def __unicode__(self):
70-
return self.guid
83+
return self.member.name

templates/base.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,13 @@ <h4>Members</h4>
7373
<div class="row body">
7474
{% for member in members %}
7575
<div class="col-xs-3">
76-
{% gravatar user.email 60 %}
77-
<span>{{ member.get_full_name }}</span>
76+
<img src="{{ member.photo_profile }}" width="60" height="60" alt="Photo {{ member.name }}">
77+
<span>{{ member.name }}</span>
78+
<ul class="nav nav-pills">
79+
{% for social in member.other_services.all %}
80+
<li><a href="{{ social.identifier }}">{{ social.name }}</a></li>
81+
{% endfor %}
82+
</ul>
7883
</div>
7984
{% endfor %}
8085
</div>

0 commit comments

Comments
 (0)