Skip to content

Commit 89bd70d

Browse files
vnbang2003vnbang2003
authored
Merge pull request #414 from pythonindia/development
Fix for details page and email None
2 parents 7102a61 + 170e977 commit 89bd70d

2 files changed

Lines changed: 28 additions & 25 deletions

File tree

‎wye/templates/workshops/workshop_detail.html‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,22 @@ <h1 class="space-0">Workshop Details</h1>
8888
<div class="row">
8989
<div class="col-xs-2"><strong>College representative</strong></div>
9090
{% for u in workshop.requester.user.all %}
91-
<div class="col-xs-2">{{u.get_full_name}} </div>
92-
<div class="col-xs-4">{{ u.email}}</div>
93-
<div class="col-xs-4">{{ u.profile.mobile}}</div>
91+
<div class="col-xs-2">{{u.get_full_name}} </div>
92+
<div class="col-xs-4">{{ u.email}}</div>
93+
<div class="col-xs-4">{{ u.profile.mobile}}</div>
9494
{% endfor %}
9595
</div>
9696
</li>
9797
<li class="list-group-item">
9898
<div class="row">
9999
<div class="col-xs-2"><strong>Presenter/Tutor</strong></div>
100100
{% for u in workshop.presenter.all %}
101-
<div class="col-xs-2">{{ u.get_full_name}}</div>
102-
<div class="col-xs-4">{{ u.email}}</div>
103-
<div class="col-xs-4">{{ u.profile.mobile}}</div>
101+
{{u.profile.slug}}
102+
<a href="{% url 'profiles:profile-page' u.profile.slug %}" >
103+
<div class="col-xs-2"><u>{{ u.get_full_name}}</u></div>
104+
</a>
105+
<div class="col-xs-4">{{ u.email}}</div>
106+
<div class="col-xs-4">{{ u.profile.mobile}}</div>
104107
{% endfor %}
105108
</div>
106109
</li>

‎wye/workshops/models.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -72,31 +72,31 @@ def save(self, force_insert=False, force_update=False, using=None):
7272
from wye.profiles.models import Profile
7373
if not self.id:
7474
domain = Site.objects.get_current().domain
75-
context = {
76-
'workshop': self,
77-
'date': self.expected_date,
78-
'workshop_url': domain + '/workshop/{}/'.format(self.id),
79-
'workshop_topic': self.workshop_section.name
80-
}
8175
# get region_interested_member email ids to notify them
8276
region_interested_member = Profile.objects.filter(
8377
interested_locations=self.requester.location,
8478
usertype__slug='tutor'
8579
).values_list('user__email', flat=True)
8680

87-
subject = '[PythonExpress] Workshop request status.'
88-
email_body = loader.get_template(
89-
'email_messages/workshop/create_workshop/message.html').render(
90-
context)
91-
text_body = loader.get_template(
92-
'email_messages/workshop/create_workshop/message.txt').render(
93-
context)
94-
for email_id in region_interested_member:
95-
send_email_to_id(
96-
subject,
97-
body=email_body,
98-
email_id=email_id,
99-
text_body=text_body)
81+
if self and self.id:
82+
context = {
83+
'workshop': self,
84+
'date': self.expected_date,
85+
'workshop_url': domain + '/workshop/{}/'.format(self.id),
86+
'workshop_topic': self.workshop_section.name
87+
}
88+
subject = '[PythonExpress] Workshop request status.'
89+
email_body = loader.get_template(
90+
'email_messages/workshop/create_workshop/message.html').render(
91+
context)
92+
text_body = loader.get_template(
93+
'email_messages/workshop/create_workshop/message.txt').render(
94+
context)
95+
for email_id in region_interested_member:
96+
send_email_to_id(
97+
subject,
98+
body=email_body,
99+
email_id=email_id, text_body=text_body)
100100

101101
super(Workshop, self).save(force_insert, force_update, using)
102102

0 commit comments

Comments
 (0)